Considerably improved logging