Fixes and updates and fixes and updates