Various updates

Signed-off-by: Andrew Ellison <me@andrewellison.co.uk>