various tidying up jobs prior to merging to master