reorganized local command options