Commits for your consideration

See individual commits for comments.
Thanks!