editable + security fixes