Fix message grammar
and uniform messages