updates - bug corrections