Tweaks

@dannyroberts a bunch of small changes - see individual commits for list