Enhancements and PY3 fixes