More 2.0 fixups for readme and setup