Re-order the options in tunala and add command switches like s_server for