fixes on the parsing logic