upgrade everything to latest versions
minor tidy up of some of the specs
plan updates