bug and usability fixes'
remove some stuff