Fixing stuff
Fixing a few more things.