More logging
Minor tweaks