major updates and improvements