Committing more work on the train.

Random edits.