fix bugs and update readme