more minor comments
Automatic Py3k merge for testing