squashing bugs...