Minor changes for python3 compat and documentation changes