some more jigsaw tuning
Merge pull request #507 from code-dot-org/jigsawTuning

[Finishes #69855032] some more jigsaw tuning