Correction relate to staying focused around the id and key correlations.
PR ready with last correction.