Fixed some bugs because I am a chump
Fixed some bugs because I am a chump