Remove testcode
Fix a ton of stuff