Changed grammar and move decoder to make speech recognition easier