Finishing touches

This commit is the last commit for inclusion to the ZIP archive for turn
in.