A large number of fixes for Python 2 vs 3 compatibility and issues mostly with renaming and deleting, issue #91, issue #93