Fixes, refactoring, removing stuff...