This commit: final commit before laptop upgrade.
This commit: integrated Miren's 2nd round of comments.