iaddtiionoal pattern matcher fixes