Updates for matching more character classes
Fixed regex to match proper comments