bug corrections
bug corrections