Fixed most parsing errors