Fixed a few tiny bugs
Merged...? Dunno what happened