squash a few bugs