Post-soft launch miscellany
Merge branch 'master' of https://github.com/manotaur/ydh2s

Post-soft launch merge of Brian and Dave's fixes