various tidying up bits as specified by RS
Merge remote-tracking branch 'origin/master'