Logging and other cleanup
Upped version to 1.1