All Bugs solved