Slightly more py3 friendly, updated todo file