Fix a few things

After refactoring, shit was broke, so now it's fixed