Fixed message forgetting
Improved logging