update + features 2

Signed-off-by: Joshua Martin <josh@insights.net.au>