More bug fixing, logging, and cleanups.
Updating README