Little bugs.

Derpy bugs introduced when cleaning the code SMOOSHED