diff --git a/src/conduit/SemiStructuredInstanceEditConduitAPIMethod.php b/src/conduit/SemiStructuredInstanceEditConduitAPIMethod.php
index 61d65a5..2ea5188 100644
--- a/src/conduit/SemiStructuredInstanceEditConduitAPIMethod.php
+++ b/src/conduit/SemiStructuredInstanceEditConduitAPIMethod.php
@@ -1,19 +1,19 @@
 <?php
 
 final class SemiStructuredInstanceEditConduitAPIMethod
   extends PhabricatorEditEngineAPIMethod {
 
   public function getAPIMethodName() {
     return 'semistructured.instance.edit';
   }
 
   public function newEditEngine() {
     return new SemiStructuredObjectInstanceEditEngine();
   }
 
   public function getMethodSummary() {
     return pht(
-      'Apply transactions to create a new Object Instances or edit an existing one.');
+      'Apply transactions to create or edit Object Instances.');
   }
 
 }
diff --git a/src/conduit/SemiStructuredInstanceSearchConduitAPIMethod.php b/src/conduit/SemiStructuredInstanceSearchConduitAPIMethod.php
index 85959a9..81c7488 100644
--- a/src/conduit/SemiStructuredInstanceSearchConduitAPIMethod.php
+++ b/src/conduit/SemiStructuredInstanceSearchConduitAPIMethod.php
@@ -1,35 +1,29 @@
 <?php
 
 final class SemiStructuredInstanceSearchConduitAPIMethod
   extends PhabricatorSearchEngineAPIMethod {
 
   public function getAPIMethodName() {
     return 'semistructured.instance.search';
   }
 
   public function newSearchEngine() {
     return new SemiStructuredObjectInstanceSearchEngine();
-    $e= new SemiStructuredObjectInstanceSearchEngine();
-
-    $cls = id(new SemiStructuredObjectTypeQuery())
-      ->setViewer(PhabricatorUser::getOmnipotentUser())
-      ->withIDs(array(2))
-      ->executeOne();
-$e->setObjectType($cls);
-    return $e;
   }
 
   public function getMethodSummary() {
     return pht('Read information about Object Instances.');
   }
 
 }
 
-// search fields to allow
-// - custom fields  -> may be hard - fields not available early enough. maybe just load all possible fields from all types?
+// TODO search fields to allow:
+// - custom fields
+//    -> may be hard - fields not available early enough.
+//       maybe just load all possible fields from all types?
 // - class ID (vs phid) ?
 // default output to include
 // - class phid
 // - raw data
 // - custom fields
 // - description, title
diff --git a/src/controller/class/SemiStructuredObjectTypeViewController.php b/src/controller/class/SemiStructuredObjectTypeViewController.php
index 35bc88f..c7f8129 100644
--- a/src/controller/class/SemiStructuredObjectTypeViewController.php
+++ b/src/controller/class/SemiStructuredObjectTypeViewController.php
@@ -1,185 +1,185 @@
 <?php
 
 final class SemiStructuredObjectTypeViewController
   extends SemiStructuredObjectTypeController {
 
   public function handleRequest(AphrontRequest $request) {
     $viewer = $request->getViewer();
     $id = $request->getURIData('id');
 
     $object_type = id(new SemiStructuredObjectTypeQuery())
       ->setViewer($viewer)
       ->withIDs(array($id))
       ->executeOne();
     if (!$object_type) {
       return new Aphront404Response();
     }
 
     $this->setObjectType($object_type);
 
     $crumbs = $this->buildApplicationCrumbs();
     $title = $object_type->getName();
 
     $header = $this->buildHeaderView();
     $curtain = $this->buildCurtain();
     $details = $this->buildDetailsView();
 
     $timeline = $this->buildTransactionTimeline(
       $object_type,
       new SemiStructuredObjectTypeTransactionQuery());
 
 
     $comment_view = id(new SemiStructuredObjectTypeEditEngine())
       ->setViewer($viewer)
       ->buildEditEngineCommentView($object_type);
 
     list($instances_header, $instances_view) = $this->buildInstancesView();
 
     $view = id(new PHUITwoColumnView())
       ->setHeader($header)
       ->setCurtain($curtain)
       ->setMainColumn(array(
           $timeline,
           $comment_view,
         ))
       ->addPropertySection(pht('Description'), $details)
       ->addPropertySection($instances_header, $instances_view);
 
 
     $navigation = $this->buildSideNavView('view');
 
     return $this->newPage()
       ->setTitle($title)
       ->setCrumbs($crumbs)
       ->setPageObjectPHIDs(array($object_type->getPHID()))
       ->setNavigation($navigation)
       ->appendChild($view);
   }
 
 private function buildDetailsView() {
     $viewer = $this->getViewer();
     $object_type = $this->getObjectType();
 
     $view = id(new PHUIPropertyListView())
       ->setUser($viewer);
 
     $description = $object_type->getDescription();
     if (strlen($description)) {
       $view->addTextContent(
         new PHUIRemarkupView($viewer, $description));
     }
 
     $custom_fields_def = $object_type->getCustomFieldsConfig();
     $custom_fields_def = id(new PhutilJSON())
       ->encodeFormatted($custom_fields_def);
 
     $view->addProperty(
       pht('Custom Fields'),
       phutil_tag('pre', array(), $custom_fields_def));
 
     return $view;
   }
 
   private function buildCurtain() {
     $viewer = $this->getViewer();
     $object_type = $this->getObjectType();
 
     $can_edit = PhabricatorPolicyFilter::hasCapability(
       $viewer,
       $object_type,
       PhabricatorPolicyCapability::CAN_EDIT);
 
     $can_create_instance = true;
 
     $id = $object_type->getID();
     $edit_uri = $this->getApplicationURI("/editclass/{$id}/");
     $create_uri = $this->getApplicationURI("/type/{$id}/new/");
     $archive_uri = $this->getApplicationURI("/type/{$id}/archive/");
 
     $curtain = $this->newCurtainView($object_type);
 
     $curtain->addAction(
       id(new PhabricatorActionView())
         ->setName(pht('Edit Object Type'))
         ->setIcon('fa-pencil')
         ->setDisabled(!$can_edit)
         ->setHref($edit_uri));
 
     $curtain->addAction(
       id(new PhabricatorActionView())
         ->setName(pht('Create New Instance'))
         ->setIcon('fa-plus')
         ->setDisabled(!$can_create_instance)
         ->setHref($create_uri));
 
     if ($object_type->isArchived()) {
       $curtain->addAction(
         id(new PhabricatorActionView())
           ->setName(pht('Activate Object Type'))
           ->setIcon('fa-check')
           ->setDisabled(!$can_edit)
           ->setWorkflow($can_edit)
           ->setHref($archive_uri));
     } else {
       $curtain->addAction(
         id(new PhabricatorActionView())
           ->setName(pht('Archive Object Type'))
           ->setIcon('fa-ban')
           ->setDisabled(!$can_edit)
           ->setWorkflow($can_edit)
           ->setHref($archive_uri));
     }
 
     return $curtain;
   }
 
   private function buildInstancesView() {
     $viewer = $this->getViewer();
     $object_type = $this->getObjectType();
 
     $instances = id(new SemiStructuredObjectInstanceQuery())
       ->setViewer($viewer)
       ->setLimit(10)
       ->withClassPHIDs(array($object_type->getPHID()))
       ->execute();
 
 
     $content = id(new SemiStructuredObjectInstanceSearchEngine())
       ->setViewer($viewer)
       ->renderResultsDirectly($instances);
 
     // $content is PhabricatorApplicationSearchResultView
 
     $box = new PHUIObjectBoxView();
 
     if ($content->getObjectList()) {
       $box->setObjectList($content->getObjectList());
     }
     if ($content->getTable()) {
       $box->setTable($content->getTable());
     }
     if ($content->getContent()) {
       $box->appendChild($content->getContent());
     }
 
     $header = pht('Instances of this type');
 
     $header = (new PHUIHeaderView())
       ->setHeader($header)
       ->addActionLink((new PHUIButtonView())
-        ->setText(pht("All Instances"))
+        ->setText(pht('All Instances'))
         ->setIcon(SemiStructuredDataApplication::ICON_OBJECT_INSTANCE_MANY)
-        ->setHref("./items/")
+        ->setHref('./items/')
         ->setTag('a')
         ->setButtonType(PHUIButtonView::BUTTONTYPE_SIMPLE))
       ->addActionLink((new PHUIButtonView())
-        ->setText(pht("Create New"))
+        ->setText(pht('Create New'))
         ->setIcon('fa-plus')
-        ->setHref("./new/")
+        ->setHref('./new/')
         ->setTag('a')
         ->setButtonType(PHUIButtonView::BUTTONTYPE_SIMPLE));
 
     return array($header, $box);
   }
 
 }
diff --git a/src/editor/SemiStructuredObjectInstanceEditEngine.php b/src/editor/SemiStructuredObjectInstanceEditEngine.php
index ca27d47..2a67fdd 100644
--- a/src/editor/SemiStructuredObjectInstanceEditEngine.php
+++ b/src/editor/SemiStructuredObjectInstanceEditEngine.php
@@ -1,148 +1,149 @@
 <?php
 
 final class SemiStructuredObjectInstanceEditEngine
   extends PhabricatorEditEngine {
 
   const ENGINECONST = 'sst:objectinstance';
 
   private $objectType;
 
   public function isEngineConfigurable() {
     return false;
   }
 
   public function getEngineName() {
     return pht('Object Instance');
   }
 
   public function getSummaryHeader() {
     return pht('Edit Object Instance');
   }
 
   public function getSummaryText() {
     return pht('This engine is used to modify object instances.');
   }
 
   public function getEngineApplicationClass() {
     return 'SemiStructuredDataApplication';
   }
 
   public function setObjectType(SemiStructuredObjectType $object_type) {
     $this->objectType = $object_type;
     return $this;
   }
 
   protected function newEditableObject() {
     $viewer = $this->getViewer();
     return SemiStructuredObjectInstance::initializeNewObjectInstance(
         $viewer,
         $this->objectType);
   }
 
   protected function newObjectQuery() {
     return new SemiStructuredObjectInstanceQuery();
   }
 
   protected function getObjectCreateTitleText($object) {
     return pht('Create Object Instance');
   }
 
   protected function getObjectCreateButtonText($object) {
     return pht('Create Object Instance');
   }
 
   protected function getObjectCreateCancelURI($object) {
     // TODO if objjec has link to class - go to that class
     return '/semistructured/';
   }
 
   protected function getEditorURI() {
     return $this->getApplication()->getApplicationURI('editinstance/');
   }
 
   public function getCreateURI($form_key) {
 
     if ($this->objectType) {
       return $this->getApplication()->getApplicationURI(
         "type/{$this->objectType->getID()}/new/");
     }
 
     return null;
   }
 
   protected function getObjectEditTitleText($object) {
     return pht('Edit Object: %d', $object->getID());
   }
 
   protected function getObjectEditShortText($object) {
     return pht('Edit Object');
   }
 
   protected function getObjectCreateShortText() {
     return pht('Create Object Instance');
   }
 
   protected function getObjectName() {
     return pht('Object Instance');
   }
 
   protected function getObjectViewURI($object) {
     return $object->getURI();
   }
 
   protected function buildCustomEditFields($object) {
 
     $fields = array(
       id(new PhabricatorTextEditField())
         ->setKey('classPHID')
         ->setLabel(pht('Object Type'))
         ->setDescription(pht('Type of the object.'))
         ->setConduitDescription(pht('Set type of object.'))
         ->setIsHidden(true)
         ->setTransactionType(
           SemiStructuredObjectInstanceClassTransaction::TRANSACTIONTYPE)
         ->setIsRequired(true)
         ->setValue($object->getClassPHID()),
       id(new PhabricatorTextEditField())
         ->setKey('name')
         ->setLabel(pht('Name'))
         ->setDescription(pht('Name of the object.'))
         ->setConduitDescription(pht('Rename the object.'))
         ->setConduitTypeDescription(pht('New object name.'))
         ->setTransactionType(
           SemiStructuredObjectInstanceNameTransaction::TRANSACTIONTYPE)
         ->setValue($object->getName()),
       id(new PhabricatorRemarkupEditField())
         ->setKey('description')
         ->setLabel(pht('Free text'))
         ->setDescription(pht('Object instance free text (Remarkup).'))
         ->setConduitTypeDescription(pht('New object free type.'))
         ->setTransactionType(
           SemiStructuredObjectInstanceDescriptionTransaction::TRANSACTIONTYPE)
         ->setValue($object->getDescription()),
 
       id(new PhabricatorTextAreaEditField())
         ->setKey('rawdata')
         ->setLabel(pht('Structured content'))
         ->setDescription(pht('Object structured data (JSON).'))
-        ->setConduitTypeDescription(pht('Object body (JSON, but as a String!).'))
+        ->setConduitTypeDescription(
+            pht('Object body (JSON, but as a String!).'))
         ->setMonospaced(true)
         ->setIsRequired(true)
         ->setTransactionType(
           SemiStructuredObjectInstanceRawDataTransaction::TRANSACTIONTYPE)
         ->setValue($object->getRawData()),
     );
 
     if ($this->objectType) {
       array_unshift(
         $fields,
         (new PhabricatorStaticEditField())
           ->setKey('objecttype')
           ->setLabel(pht('Object Type'))
           ->setValue($this->objectType->getName()));
     }
 
     return $fields;
   }
 
 }
diff --git a/src/storage/SemiStructuredObjectInstance.php b/src/storage/SemiStructuredObjectInstance.php
index fdf95b8..d25137b 100644
--- a/src/storage/SemiStructuredObjectInstance.php
+++ b/src/storage/SemiStructuredObjectInstance.php
@@ -1,239 +1,240 @@
 <?php
 
 final class SemiStructuredObjectInstance extends SemiStructuredDAO
   implements
     PhabricatorPolicyInterface,
     PhabricatorApplicationTransactionInterface,
     PhabricatorSubscribableInterface,
     PhabricatorFlaggableInterface,
     PhabricatorProjectInterface,
     PhabricatorFerretInterface,
     PhabricatorFulltextInterface,
     PhabricatorMentionableInterface,
     PhabricatorConduitResultInterface,
     PhabricatorCustomFieldInterface,
     PhabricatorDestructibleInterface {
 
 
   protected $classPHID;
   protected $status;
   protected $name;
   protected $rawData = '{}';
   protected $description;
 
 
   const STATUS_ACTIVE = 'active';
   const STATUS_ARCHIVED = 'archived';
 
   private $class = self::ATTACHABLE;
   private $customFields = self::ATTACHABLE;
 
   public static function initializeNewObjectInstance(
       PhabricatorUser $actor,
       SemiStructuredObjectType $object_class = null) {
 
     $object = id(new self())
-    // ->setViewPolicy(PhabricatorPolicies::getMostOpenPolicy()) // TODO take policies from class?
+    // TODO take policies from class?
+    // ->setViewPolicy(PhabricatorPolicies::getMostOpenPolicy())
     // ->setEditPolicy($actor->getPHID())
     ->setStatus(self::STATUS_ACTIVE);
 
     if ($object_class !== null) {
       $object
         ->setClassPHID($object_class->getPHID())
         ->attachClass($object_class);
     }
 
     return $object;
   }
 
   public function attachClass(
       SemiStructuredObjectType $object_class = null) {
     $this->class = $object_class;
     return $this;
   }
 
   public function getClass() {
     return $this->assertAttached($this->class);
   }
 
   public function hasAttachedClass() {
     return $this->class !== self::ATTACHABLE;
   }
 
   public function getURI() {
     return urisprintf('/semistruct/instance/%d/', $this->getID());
   }
 
 
   public function getIcon() {
     // TODO customize in Type
     return SemiStructuredDataApplication::ICON_OBJECT_INSTANCE;
   }
 
   public static function getStatusNameMap() {
     return array(
       // TODO remove this
       self::STATUS_ACTIVE => pht('Active'),
       self::STATUS_ARCHIVED => pht('Archived'),
     );
   }
 
   protected function getConfiguration() {
     return array(
       self::CONFIG_AUX_PHID => true,
       self::CONFIG_SERIALIZATION => array(
         'rawData' => self::SERIALIZATION_JSON,
       ),
       self::CONFIG_COLUMN_SCHEMA => array(
         'name' => 'sort255',
         'description' => 'text',
         'status' => 'text32',
       ),
       self::CONFIG_KEY_SCHEMA => array(
         'classPHID' => array(
           'columns' => array('classPHID'),
         ),
       ),
     ) + parent::getConfiguration();
   }
 
 
   public function getPHIDType() {
     return SemiStructuredObjectInstancePHIDType::TYPECONST;
   }
 
 /* -(  PhabricatorApplicationTransactionInterface  )------------------------- */
 
 
   public function getApplicationTransactionEditor() {
     return new SemiStructuredObjectInstanceTransactionEditor();
   }
 
   public function getApplicationTransactionTemplate() {
     return new SemiStructuredObjectInstanceTransaction();
   }
 
 
 /* -(  PhabricatorPolicyInterface  )----------------------------------------- */
 
 
   public function getCapabilities() {
     return array(
       PhabricatorPolicyCapability::CAN_VIEW,
       PhabricatorPolicyCapability::CAN_EDIT,
     );
   }
 
   public function getPolicy($capability) {
 return ''; // TODO
     switch ($capability) {
       // TODO
       case PhabricatorPolicyCapability::CAN_VIEW:
         return $this->getViewPolicy();
       case PhabricatorPolicyCapability::CAN_EDIT:
         return $this->getEditPolicy();
     }
   }
 
   public function hasAutomaticCapability($capability, PhabricatorUser $viewer) {
     return true;
   }
 
 /* -(  PhabricatorCustomFieldInterface  )------------------------------------ */
 
 
   public function getCustomFieldSpecificationForRole($role) {
     return array();
   }
 
   public function getCustomFieldBaseClass() {
     return 'SemiStructuredInstanceCustomField';
   }
 
   public function getCustomFields() {
     return $this->assertAttached($this->customFields);
   }
 
   public function attachCustomFields(PhabricatorCustomFieldAttachment $fields) {
     $this->customFields = $fields;
     return $this;
   }
 
 
 /* -(  PhabricatorConduitResultInterface  )---------------------------------- */
 
 
   public function getFieldSpecificationsForConduit() {
     return array(
       (new PhabricatorConduitSearchFieldSpecification())
         ->setKey('name')
         ->setType('string')
         ->setDescription(pht('The name of the instance.')),
       (new PhabricatorConduitSearchFieldSpecification())
         ->setKey('description')
         ->setType('remarkup')
         ->setDescription(pht('The description.')),
       (new PhabricatorConduitSearchFieldSpecification())
         ->setKey('classPHID')
         ->setType('phid')
         ->setDescription(pht('The Type of this Instance.')),
       (new PhabricatorConduitSearchFieldSpecification())
         ->setKey('rawData')
         ->setType('map<string, wild>')
         ->setDescription(pht('The raw structured data')),
 
 // TODO custom fields
 
     );
   }
 
   public function getFieldValuesForConduit() {
     return array(
       'name' => $this->getName(),
       'description' => array(
         'raw' => $this->getDescription(),
       ),
       'classPHID' => $this->getClassPHID(),
       'rawData' => json_decode($this->getRawData()),
     );
   }
 
   public function getConduitSearchAttachments() {
     return array();
   }
 
 /* -(  PhabricatorFerretInterface  )----------------------------------------- */
 
 
   public function newFerretEngine() {
     return new SemiStructuredObjectInstanceFerretEngine();
   }
 
 /* -(  PhabricatorFulltextInterface  )--------------------------------------- */
 
 
   public function newFulltextEngine() {
     return new SemiStructuredObjectInstanceFulltextEngine();
   }
 
 
 /* -(  PhabricatorDestructibleInterface  )----------------------------------- */
 
 
   public function destroyObjectPermanently(
     PhabricatorDestructionEngine $engine) {
 
     $this->openTransaction();
       $this->delete();
     $this->saveTransaction();
   }
 
 
 /* -(  PhabricatorSubscribableInterface  )----------------------------------- */
 
 
   public function isAutomaticallySubscribed($phid) {
     return false;
   }
 
 }