Fixed dozens of Bugs