Fixing Stuff and updating