Fixed a couple of bugs that came out in user testing
Updated README