some usability improvements