Updating Parser with some left-over changes
Made multi-line comments capture inclusive to work properly