more work on chapter select.

See commit details.