Few bugs solved