Fixed some stupid bugs I somehow put in