Multiple updates and improvements