more usability improvements