updated regexes and fixing more shift/reduce conflicts