Bugs corriged