minor enhancements, bug fixes and updated README