further refinements for matterhorn 1.4