Some minor bug fixes
Updated README