Updated README and a couple bug fixes