All Bugs (at the moment) fixed