Fixes and Update