Also fixes some regressions due to command syntax changes
Based on material presented during MD Workshop at Temple University in August 2016.