minor bug fixes, improvements for usability