Derpy

Fixed some stuff that I derped on