Fixes and updates
Fixes and changes
Fixes and changes