improve editor
reformatting
plumb wiki key through instead, and fix some of the tests