Updates to work with python3 -- with these changes it worksforme(tm)