updates and fixes
updates and fixes