yet more updates...

Signed-off-by: James <james@method.org.uk>