format and usability fixes