fix bugs and add info