some fixes on parse