Make Advanced Options command line editable (and some other suggestions)