Add grammar annotations and update todo.txt