Pull request for fixing things

Yay