started editing grammar, updating code