Bring up to date

Some tweaks to build cleanly and get the latest content. Still needs more work but this is a start!