Update command parsing so it can handle quotes and extra white space