Jdw enhancements

This is my first github pull request -- so I hope I don't mess this up. =)

Looking to ultimately merge jdw-enhancements --> master.