honor CLI vars
rearrange