number of fixes and improvements