Trying to clean up that mess
Cleaning stuff.
Fixing some more stuff. Hopefull, everything should be working now.