surface module fixes; Mechanism() and Style() primitives