Renamed logging code, tried to get setup.py working, minor changes