Parser fixes. Some editor work.