Fixed some stuff messed up more