small updates and improvements