Corrections to all parts.

Signed-off-by: Chris Lamb <chris@chris-lamb.co.uk>
Add TODO

Signed-off-by: Chris Lamb <chris@chris-lamb.co.uk>
oops

Signed-off-by: Chris Lamb <chris@chris-lamb.co.uk>