Editor changes, some editor cleanup