bug fixes and usability improvements