Editor updates

There is still a trail of commits I can't figure out why they are in the PR but the editor changes are in here and working.