README fixes, bug fixes, cleanup.