misc fixup work
Merge branch 'master' of https://github.com/fire/ES_Downloader
fixing what I can