Simplified imports (now relative), fixed a few Py3 bugs