fixed some parsing errors