various editor & freeze improvements