Bugs solved