More refactoring, fixes
Stuff
Fix bug