Fixed #35 + trace takes advantage of modifiers now