MOD: refactor regex, add set & repeat range syntax