some bug squashing