Fixing messages and documentation