fix for 2.10 stacking & patch for lit match stacking being broken

[dommrogers]

Lit match patch should be fine even if/when HL fix the issue as it targets either stack being "Lit" and nothing else.