implementing more cmd opt. little reorganization'