Added editor client + few server improvements