Fixed some stuff

Bwaaaaaah