Finished fixing up for python3