Fixed messed up things