Fixes from manual testing
Updated README