bug fixes/minor enhancements