diff --git a/genericcore.cpp b/genericcore.cpp
index 4cf0500..e1a68a7 100644
--- a/genericcore.cpp
+++ b/genericcore.cpp
@@ -19,6 +19,15 @@ using namespace std;
 GenericCore::GenericCore() {
   qDebug() << "Creating core...";
 
+  QCoreApplication::setOrganizationName("Working-Copy Collective");
+  QCoreApplication::setOrganizationDomain("working-copy.org");
+
+#ifdef QT_DEBUG
+  QCoreApplication::setApplicationName(QString(APPLICATION_NAME) + "-dev");
+#else
+  QCoreApplication::setApplicationName(QString(APPLICATION_NAME));
+#endif
+
   // TODO let the model own its undo stack (& use TableModel::getUndoStack() if necessary)
   m_modelUndoStack = new QUndoStack(this);
 
diff --git a/model/tablemodel.h b/model/tablemodel.h
index 069179e..dd54f3a 100644
--- a/model/tablemodel.h
+++ b/model/tablemodel.h
@@ -43,6 +43,7 @@ class TableModel : public QAbstractTableModel {
 
  private:
   /// *** members ***
+  // TODO shared_ptr -> unique_ptr
   QList<shared_ptr<ModelItem>> m_items;
   QUndoStack* m_undoStack;