Variety of fixes/additions
Merge remote-tracking branch 'origin/master'