General updates and improvements