post-user-test refactoring
minor additional notes