Update the make files as advised by Morgan.
Update to new build system and other code changes.