lots of usability fixes