account for flying critters, fix an oversight or two