bunch of features changes and small fixes

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