2to3 run OK
Few corrections to what 2to3 did