Fixed some stuff

Saw some issues. Fixed that for you.