Some messages fixes, and information addition