Last commit of the day, fixing a few things

God, I need to get myself a personal branch lol