Updated readme and minor cleanup.