Pull request for fixing things

yay