Improved docs and log messages