#pattern-matching comments fixed