wrapping the last few obvious things.

Signed-off-by: Chris Jones <chris@jonezy.org>
cleanup and simple breadcrumbs

Signed-off-by: Chris Jones <chris@jonezy.org>