Updates and fixed editor