fix bugs and updating info