Pull request for fixing of things

Yay fixing of things.