more compact mod support. fixed regex