Improved logging slightly.