Fixes
Refactor some more