Editor and framework improvements.