tweaks logging
merged