various usability improvements