last few py2 to py2 and py3, missed a couple of syntax errors