Fixed the grammatical issues/warning and error boxes