Fixes saves and other bugs