Allow runs of multiple factors
Remove the EBNF comment