Adding some more structured comments to recognize. Found a bug on optional words as variable part of comment regex