Tidying Make targets and re-cleaning, checking, resolving.
Renumber/rename all the things