Fixing Stuff

as usual