Fixed some stuff Justin messed up.