Add commapnd line options
Tweak option handling (Permute)