Undid stuff and removed stuff and fixed stuff