- enhanced logging a little bit