Updates 1.5.1 and improvements