big fixes edit mode