numerous fixes to usability and functionality