basic usability fixes