removed stuff, fixed stuff