Tidy up ready for deployment, including hiding a few incomplete sections...

....