Making better use of manifest files.  Minor adjustments.