Handled lex rules, changed command analysis for % tokens