Minor bug fixes, some code cleanups, enhanced README file among other updates