misc: improved logging