more CLI flag parsing for #14