update to latest fixes and improvements