improved

Weekly fixes and improvements

fixed

Weekly Fixes and Improvements