Updated several files
Cleaned up, tried to make more py3k ready