[improvement] Improved logging...