removed some stuff
some minor changes