Fixes and updated