usability improvements, hopefully