Fixed some stuff like I am wont to do.