Fixed some stuff that was really bugging me so I can properly focus on other things :P