update readme and fix bugs