A few minor fixes. How it grabs commands for starts.