Simplified the flags that control running modes
Minor things