modified files for hte switch to python 2