Fixed a few things

^^ I didn't lie.. I promise