bug fix - usability fixes