(EDITOR) moving fixes..