Bugs found
PartB rework done, matching strings and comments without regex now, should be all working