fix message keys and few typos