More details about error reporting
Few typos and re-wordings