Various enhancements
Updated README