Found and fix bugs