few more usability changes