more commend fixing and options rearanging