fixes and removed stuff