enhance logging a bit