updates and fixes
updates