bug squashing: work in progress