More python 3 updates, python 2 should still work