Last minute features and fixes
Merge branch 'master' of https://github.com/manotaur/ydh2s

Merging my and Dave's final night of updates before launch