re #41 - improvements based on video from user testing