Bunch of updates

Signed-off-by: James <james@astonishdesign.com>