bugs with messages fixed