diff --git a/wax-prosemirror-components/package.json b/wax-prosemirror-components/package.json
index b24f0ded114ac6096895a6c87177c2f8f7c8f715..a6a5286f62d4df9a79dda457c2371185966eaf93 100644
--- a/wax-prosemirror-components/package.json
+++ b/wax-prosemirror-components/package.json
@@ -4,7 +4,7 @@
   "version": "0.0.14",
   "description": "Wax prosemirror UI components",
   "license": "MIT",
-  "main": "dist/index.js",
+  "main": "index.js",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",
     "build": "BABEL_ENV=production rollup -c"
diff --git a/wax-prosemirror-components/src/components/rightArea/RightArea.js b/wax-prosemirror-components/src/components/rightArea/RightArea.js
index b66fa208e103b1ef45964ac047cf50a9df15613f..980806afbfae93ecb456e3d5487986f90f662d33 100644
--- a/wax-prosemirror-components/src/components/rightArea/RightArea.js
+++ b/wax-prosemirror-components/src/components/rightArea/RightArea.js
@@ -27,12 +27,7 @@ export default ({ area }) => {
     let top = 0;
     const allCommentsTop = [];
 
-    const nodesMarksToIterrate =
-      marksNodes[area] === 'main'
-        ? sortBy(marksNodes[area], ['pos'])
-        : marksNodes[area];
-
-    each(nodesMarksToIterrate, (markNode, pos) => {
+    each(marksNodes[area], (markNode, pos) => {
       const WaxSurface = main.dom.getBoundingClientRect();
       const id =
         markNode instanceof Mark ? markNode.attrs.id : markNode.node.attrs.id;
@@ -186,7 +181,6 @@ const updateMarks = view => {
     const nodesAndMarks = [...uniqBy(finalMarks, 'attrs.id'), ...finalNodes];
 
     const groupedMarkNodes = {};
-
     nodesAndMarks.forEach(markNode => {
       const markNodeAttrs = markNode.attrs
         ? markNode.attrs
@@ -198,7 +192,11 @@ const updateMarks = view => {
         groupedMarkNodes[markNodeAttrs.group].push(markNode);
       }
     });
-    return groupedMarkNodes;
+
+    return {
+      main: sortBy(groupedMarkNodes.main, ['pos']),
+      notes: groupedMarkNodes.notes,
+    };
   }
   return [];
 };
diff --git a/wax-prosemirror-core/package.json b/wax-prosemirror-core/package.json
index 97cbb90d59495468f336e472e9a61b92f1e896d8..831b17f3beb4d667f0a3a516c721bc065b9be91c 100644
--- a/wax-prosemirror-core/package.json
+++ b/wax-prosemirror-core/package.json
@@ -4,7 +4,7 @@
   "version": "0.0.14",
   "description": "Wax prosemirror core",
   "license": "MIT",
-  "main": "dist/index.js",
+  "main": "index.js",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",
     "build": "BABEL_ENV=production rollup -c"
diff --git a/wax-prosemirror-core/src/WaxView.js b/wax-prosemirror-core/src/WaxView.js
index 2f4736a1cc1ada93c9f19a031aff8dcb394df423..37d0470a2223be8fb2dd2f6925f351f1fc5abf90 100644
--- a/wax-prosemirror-core/src/WaxView.js
+++ b/wax-prosemirror-core/src/WaxView.js
@@ -62,9 +62,10 @@ export default props => {
   const dispatchTransaction = transaction => {
     const { TrackChange } = props;
 
-    const tr = TrackChange.enabled
-      ? trackedTransaction(transaction, view.state, user)
-      : transaction;
+    const tr =
+      TrackChange && TrackChange.enabled
+        ? trackedTransaction(transaction, view.state, user)
+        : transaction;
 
     const state = view.state.apply(tr);
     view.updateState(state);
diff --git a/wax-prosemirror-layouts/package.json b/wax-prosemirror-layouts/package.json
index be2879a7a150751e464ba1dcc847511154ee44f8..fb0d1f2799465852523e8ae5f26b02f4db2d1bbc 100644
--- a/wax-prosemirror-layouts/package.json
+++ b/wax-prosemirror-layouts/package.json
@@ -4,7 +4,7 @@
   "version": "0.0.14",
   "description": "Wax prosemirror layouts",
   "license": "MIT",
-  "main": "dist/index.js",
+  "main": "index.js",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",
     "build": "BABEL_ENV=production rollup -c"
diff --git a/wax-prosemirror-plugins/package.json b/wax-prosemirror-plugins/package.json
index 83a315dd24282c1e1381ae478483ae8d243f06b6..e655f3c24ea7dba9d232f39e8b579e7deef11ca9 100644
--- a/wax-prosemirror-plugins/package.json
+++ b/wax-prosemirror-plugins/package.json
@@ -4,7 +4,7 @@
   "version": "0.0.14",
   "description": "Wax prosemirror plugins",
   "license": "MIT",
-  "main": "dist/index.js",
+  "main": "index.js",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",
     "build": "BABEL_ENV=production rollup -c"
diff --git a/wax-prosemirror-schema/package.json b/wax-prosemirror-schema/package.json
index da3487bde1d353d67270c495fdbebe4c8398efb1..d3fd23712261db55b5a633f03615dc988498b7b9 100644
--- a/wax-prosemirror-schema/package.json
+++ b/wax-prosemirror-schema/package.json
@@ -4,7 +4,7 @@
   "version": "0.0.14",
   "description": "Wax prosemirror schema",
   "license": "MIT",
-  "main": "dist/index.js",
+  "main": "index.js",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",
     "build": "BABEL_ENV=production rollup -c"
diff --git a/wax-prosemirror-schema/src/nodes/footNoteNode.js b/wax-prosemirror-schema/src/nodes/footNoteNode.js
index f1a97afd24d119771461e380e62d25c238eef635..aaf0143e766578ed007b1acbe35c4c82de837c83 100644
--- a/wax-prosemirror-schema/src/nodes/footNoteNode.js
+++ b/wax-prosemirror-schema/src/nodes/footNoteNode.js
@@ -1,7 +1,7 @@
 // TODO Write the node in WaxSchema
 const footnote = {
   group: 'inline',
-  content: 'block*',
+  content: 'block',
   inline: true,
   atom: true,
   attrs: {
diff --git a/wax-prosemirror-services/package.json b/wax-prosemirror-services/package.json
index 2462dff95d0434229bc923f1d4162412df3b46c8..4e1a066daefa91613086c47128bc60eeda811996 100644
--- a/wax-prosemirror-services/package.json
+++ b/wax-prosemirror-services/package.json
@@ -4,7 +4,7 @@
   "version": "0.0.14",
   "description": "Wax prosemirror services",
   "license": "MIT",
-  "main": "dist/index.js",
+  "main": "index.js",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",
     "build": "BABEL_ENV=production rollup -c"
diff --git a/wax-prosemirror-services/src/SchemaService/Schema.js b/wax-prosemirror-services/src/SchemaService/Schema.js
index 7b935080d963b0baccc5dbfc9cc4af16d50f4f55..2f4066464ddc3e2c7144c5fff945f7b1669e2891 100644
--- a/wax-prosemirror-services/src/SchemaService/Schema.js
+++ b/wax-prosemirror-services/src/SchemaService/Schema.js
@@ -1,9 +1,9 @@
-import { Schema as PmPschema } from "prosemirror-model";
-import { injectable } from "inversify";
-import DefaultSchema from "./DefaultSchema";
+import { Schema as PmPschema } from 'prosemirror-model';
+import { injectable } from 'inversify';
+import DefaultSchema from './DefaultSchema';
 
-import Node from "./Node";
-import Mark from "./Mark";
+import Node from './Node';
+import Mark from './Mark';
 
 @injectable()
 export default class Schema {
@@ -60,7 +60,7 @@ export default class Schema {
       return this._nodes[instance.name]
         ? this._nodes[instance.name]
         : Object.assign(this._nodes, {
-            [instance.name]: instance
+            [instance.name]: instance,
           });
     }
 
@@ -68,7 +68,7 @@ export default class Schema {
       return this._marks[instance.name]
         ? this._marks[instance.name]
         : Object.assign(this._marks, {
-            [instance.name]: instance
+            [instance.name]: instance,
           });
     }
   }
@@ -76,7 +76,7 @@ export default class Schema {
   addProsemirrorSchema(nodes, type) {
     this.prosemirrorSchema[type] = Object.assign(
       this.prosemirrorSchema[type],
-      nodes
+      nodes,
     );
   }
 
@@ -94,7 +94,7 @@ export default class Schema {
 
     this.schema = new PmPschema({
       nodes: Object.assign(nodes, this.prosemirrorSchema.nodes),
-      marks: Object.assign(marks, this.prosemirrorSchema.marks)
+      marks: Object.assign(marks, this.prosemirrorSchema.marks),
     });
     return this.schema;
   }
diff --git a/wax-prosemirror-themes/package.json b/wax-prosemirror-themes/package.json
index 8d978a00ad71accca3900e4f9470d058272d597c..b48cf8458a5545824f07c259e8bf7b4fa11e5e51 100644
--- a/wax-prosemirror-themes/package.json
+++ b/wax-prosemirror-themes/package.json
@@ -4,7 +4,7 @@
   "version": "0.0.14",
   "description": "Wax prosemirror themes",
   "license": "MIT",
-  "main": "dist/index.js",
+  "main": "index.js",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",
     "build": "BABEL_ENV=production rollup -c"
diff --git a/wax-prosemirror-utilities/package.json b/wax-prosemirror-utilities/package.json
index 06876d5ebf1a734c0a9114e70b9c04a975ad24ef..de00b3f4dbd142e8ae4c68af4df9890dc9512a23 100644
--- a/wax-prosemirror-utilities/package.json
+++ b/wax-prosemirror-utilities/package.json
@@ -4,7 +4,7 @@
   "version": "0.0.14",
   "description": "Wax prosemirror utilities",
   "license": "MIT",
-  "main": "dist/index.js",
+  "main": "index.js",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",
     "build": "BABEL_ENV=production rollup -c"