usability/testing improvements