fix up print statements (for Python 3)
forgot to commit
merging changes