PY3 updates and unrelated enhancements