bugs corrections
bugs correction