Fixing things

Cleaning the mess and making it less broken