Tweaked error messages and fixed typos