new fixes and improvements