more testing and usability improvements