many fixes on parsing process