fixes and improvements set