Improved logging, help and cleanup.