Arg parsing + 2 new options