Updated parsing errors, and formatting.