Updating README and minor logic improvements