Parser logic improvements#313

JJ-8 merged 5 commits intomainTFNS/CTFNote:mainfrom

269-parser-logic-improvementTFNS/CTFNote:269-parser-logic-improvementCopy head branch name to clipboard