Completed entropy calculation for numerical patterns. Yet another semantics change on PartialNumericalMatch

Plus minor bug fixes