update readme and minor cleanup