massive number of fixes and updates