Updated to final version.  Only minor tweaks expected now.