some usability fixes