undid some stuff and redid some other stuff