usability fixes