Final editor version. Minor bugs remain