various usability fixes