more bug squashing