reworked logging messages