bug fixes; parsing errors handling