Misc. cleanup in preparation for first real run next week.

Please see commit messages for details of changes. This resolves issue #28.