Submit mostly, a few other changes to
Merge pull request #13 from drewguild/DG/misc

Submit mostly, a few other changes to