many usability fixes