logging and comment tweaks