Another round of spelling fixes

And also renamed a loop variable while there.

No functional change.
Re-fix a comment

No functional change.
Merge branch 'master' into aspiration_db_limited
Set max window size to 20

bench: 8388808