some more changes

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

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