Add General Improvements

Add general fixes and improvements