Grammar corrections and structure improvements