diff --git a/README.md b/README.md
index 03d910924ec717945d653c7acd56f88d65fb8ce7..e5895830a0036fa22964fcfcfcb4f8f3218b434c 100644
--- a/README.md
+++ b/README.md
@@ -2,19 +2,41 @@
   <h1>Wax Editor</h1>
 </div>
 
-| [![MIT license](https://img.shields.io/badge/license-MIT-e51879.svg)](https://github.com/christos8333/wax-prosemirror/raw/master/LICENSE) |
-| :---------------------------------------------------------------------------------------------------------------------------------------: |
+| [![MIT license](https://img.shields.io/badge/license-MIT-e51879.svg)](https://gitlab.coko.foundation/wax/wax-prosemirror/raw/master/LICENSE) |
+| :------------------------------------------------------------------------------------------------------------------------------------------: |
 
 
 This library is being developed by the [Coko Foundation](https://coko.foundation/).
+Wax Editor is build on top of the Prosemirror library. Check Prosemirror [website](https://prosemirror.net/) and [GitHub repo](https://github.com/ProseMirror) for more information.
 
-Wax Editor is build against Prosemirror libraries. Check Prosemirror [website](https://prosemirror.net/) and [GitHub repo](https://github.com/ProseMirror) for more information.
+## Roadmap
+
+Wax-prosemirror is under active development. The current roadmap is as follows:
+
+### September 2020
+
+Alpha version, including comments and track changes. See the rest of this file for a full list of current functionality.
+
+### November 2020
+
+Beta version, including some new features:
+
+- Find and replace
+- Spellchecker
+- Special characters
+- Transform cases
+- Word counter
+- Custom tags
+
+### January 2021
+
+V1.0, freeze new feature development, focus on stability, testing and bug fixes
 
 ## Get up and running
 
 Run a local version of the editor
 
-1.  `git clone git@github.com:christos8333/wax-prosemirror.git`
+1.  `git clone git@gitlab.coko.foundation:wax/wax-prosemirror.git`
 
 2.  `yarn with node >= 12`
 
@@ -26,8 +48,6 @@ Run a local version of the editor
 
 Scripts: `yarn` , `yarn clean`, `yarn reset`
 
-### Check the current online demo of the [editor](https://christos8333.github.io/editor-demo/)
-
 ## Introduction
 
 Wax depends on the following libraries.
@@ -42,8 +62,8 @@ Wax depends on the following libraries.
 
 Currently Wax is under heavy development. Master holds a as possible as stable version of the editor. For latest versions see [here](#latest-versions). Documentation follows, but it is rather limited for now. It lists all the basic parts , and includes a brief explanation on how to configure Wax for your own project. More detailed examples will follow.
 
-Check editoria [editor](https://github.com/christos8333/wax-prosemirror/blob/master/editors/editoria/src/Editoria.js), editoria's [package.json](https://github.com/christos8333/wax-prosemirror/blob/master/editors/editoria/package.json)
-and editoria's [configuration file](https://github.com/christos8333/wax-prosemirror/blob/master/editors/editoria/src/config/config.js) for a full example on how to mount Wax and all available packages(services).
+Check editoria [editor](https://gitlab.coko.foundation/wax/wax-prosemirror/blob/master/editors/editoria/src/Editoria.js), editoria's [package.json](https://gitlab.coko.foundation/wax/wax-prosemirror/blob/master/editors/editoria/package.json)
+and editoria's [configuration file](https://gitlab.coko.foundation/wax/wax-prosemirror/blob/master/editors/editoria/src/config/config.js) for a full example on how to mount Wax and all available packages(services).
 
 ### Editor Properties
 
@@ -55,10 +75,11 @@ onChange; // when the editor's surface is updated (perform an action ex. save)
 value; // the actual HTML content of the editor
 fileUpload; // used for uploading images (should return a promise with the actual file path)
 placeholder; // a placeholder used for empty documents
-config; // adds on the editor anything from new services, tools, Pmpplugins etc. Check [editoria config](https://github.com/christos8333/wax-prosemirror/blob/master/editors/editoria/src/config/config.js)
+config; // adds on the editor anything from new services, tools, Pmpplugins etc. Check [editoria config](https://gitlab.coko.foundation/wax/wax-prosemirror/blob/master/editors/editoria/src/config/config.js)
 readonly; // editor in in read-only mode
 onBlur; // on focus lost
 layout; // used to create your own Layout using React components
+TrackChange; // enables track changes (under development)
 debug; // dev-tools (https://github.com/d4rkr00t/prosemirror-dev-tools)
 ```
 
@@ -87,7 +108,7 @@ The role of wax-core is
 
 - Mount a prosemirror instance
 
-- Initiate default [services](https://github.com/christos8333/wax-prosemirror/blob/master/wax-prosemirror-core/src/config/defaultConfig.js)
+- Initiate default [services](https://gitlab.coko.foundation/wax/wax-prosemirror/blob/master/wax-prosemirror-core/src/config/defaultConfig.js)
 
   1.  LayoutService
 
@@ -99,7 +120,7 @@ The role of wax-core is
 
   5.  ShortCutsService
 
-A big part of wax-core is the [application layer](https://github.com/christos8333/wax-prosemirror/blob/master/wax-prosemirror-core/src/Application.js), which is responsible for the application’s lifecycle by registering and booting services, merging configs, using the schema
+A big part of wax-core is the [application layer](https://gitlab.coko.foundation/wax/wax-prosemirror/blob/master/wax-prosemirror-core/src/Application.js), which is responsible for the application’s lifecycle by registering and booting services, merging configs, using the schema
 and gathering all prosemirror plugins.
 
 Also holds some default prosemirror plugins that are necessary like the dropCursor, gapCursor, history and some optional as the placeholder.
@@ -114,10 +135,10 @@ For more information on how a Wax node/mark is different check the [SchemaServic
 React components to support various features of the editor from buttons to overlays to comment discussions etc. Right now is really basic as the focus is not yet on UI.
 
 <h2> wax-prosemirror-themes </h2>
- Holds the different themes of the editor. Check the options in the [CokoTheme](https://github.com/christos8333/wax-prosemirror/blob/master/wax-prosemirror-themes/src/coko-theme)
+ Holds the different themes of the editor. Check the options in the [CokoTheme](https://gitlab.coko.foundation/wax/wax-prosemirror/blob/master/wax-prosemirror-themes/src/coko-theme)
 
 <h2> wax-prosemirror-layouts </h2>
-Holds different layouts of the editor. Through the layout service you can configure the areas of different components. As an example check [EditoriaLayout](https://github.com/christos8333/wax-prosemirror/blob/master/wax-prosemirror-layouts/src/layouts/EditoriaLayout.js)
+Holds different layouts of the editor. Through the layout service you can configure the areas of different components. As an example check [EditoriaLayout](https://gitlab.coko.foundation/wax/wax-prosemirror/blob/master/wax-prosemirror-layouts/src/layouts/EditoriaLayout.js)
 
 <h2> wax-prosemirror-utilities </h2>
  Various helpers methods needed throughout Wax to support the funcionality needed.
@@ -131,7 +152,7 @@ Editors are private pakages inside the monorepo, for development/demo purposes.
 
 But, what do we mean by "bootstrapped"? In general, we mean registering things, including registering service container bindings and event listeners. Service providers are the central place to configure your application.
 
-If you open [editoria's config file](https://github.com/christos8333/wax-prosemirror/blob/master/editors/editoria/src/config/config.js),
+If you open [editoria's config file](https://gitlab.coko.foundation/wax/wax-prosemirror/blob/master/editors/editoria/src/config/config.js),
 you will see the config file where you can configure the extra services (apart from those Wax will load on init) of your editor.
 These are all of the service provider classes that will be loaded for your application.
 
@@ -139,7 +160,7 @@ In the following overview we will see how to write our own service providers and
 
 <h3>Writing Service Providers</h2>
 
-All service providers extend the [Service](https://github.com/christos8333/wax-prosemirror/blob/master/wax-prosemirror-core/src/services/Service.js) class. Most service providers contain a register and a boot method. Within the register method, you should only bind things into the service container.
+All service providers extend the [Service](https://gitlab.coko.foundation/wax/wax-prosemirror/blob/master/wax-prosemirror-core/src/services/Service.js) class. Most service providers contain a register and a boot method. Within the register method, you should only bind things into the service container.
 
 <h3>The Register Method</h3>
 
@@ -196,7 +217,7 @@ In the above example we bind ShortCuts to a factory method which injects PmPlugi
 
 So, what if we need to register a view component within our service provider? This should be done within the boot method. This method is called after all other service providers have been registered, meaning you have access to all other services that have been registered.
 
-A good example could be the [MenuSerivce](https://github.com/christos8333/wax-prosemirror/blob/master/wax-prosemirror-services/src/MenuService/MenuService.js)
+A good example could be the [MenuSerivce](https://gitlab.coko.foundation/wax/wax-prosemirror/blob/master/wax-prosemirror-services/src/MenuService/MenuService.js)
 
 ```javascript
 boot() {
@@ -230,7 +251,7 @@ class InlineAnnotationsService extends Service {
 ```
 
 2.  Within any of your service provider methods, you always have access to the app, config properties .
-3.  Dependant functionality between services. An example of the dependency between two services are [linkService](https://github.com/christos8333/wax-prosemirror/blob/master/wax-prosemirror-services/src/LinkService/LinkService.js) and [OverLayService](https://github.com/christos8333/wax-prosemirror/blob/master/wax-prosemirror-services/src/OverlayService/OverlayService.js) where OverLayService registers a function
+3.  Dependant functionality between services. An example of the dependency between two services are [linkService](https://gitlab.coko.foundation/wax/wax-prosemirror/blob/master/wax-prosemirror-services/src/LinkService/LinkService.js) and [OverLayService](https://gitlab.coko.foundation/wax/wax-prosemirror/blob/master/wax-prosemirror-services/src/OverlayService/OverlayService.js) where OverLayService registers a function
     that adds a component to the overlay area and LinkService calls OverLay and adds it’s component. ShortCut Service could be another example where each of the services like Strong, paragraph etc can call it to add a shortcut.
 
 ## Core Services
@@ -312,7 +333,7 @@ If the above 2 services are registed SchemaService will merge those 2 nodes into
 
 ### LayoutService
 
-This service enables us to set a layout for the editor. Internally Wax calls the setLayout method to apply a layout. How can you write your own layout. Check Editoria's [layout](https://github.com/christos8333/wax-prosemirror/blob/master/wax-prosemirror-layouts/src/layouts/EditoriaLayout.js).
+This service enables us to set a layout for the editor. Internally Wax calls the setLayout method to apply a layout. How can you write your own layout. Check Editoria's [layout](https://gitlab.coko.foundation/wax/wax-prosemirror/blob/master/wax-prosemirror-layouts/src/layouts/EditoriaLayout.js).
 
 A layout is a react component which has a prop the mounted prosemirror instance in order to place within the layout. You can also have your own “Areas”. For example in EditoriaLayout we have the following
 
@@ -374,11 +395,11 @@ Lastly Layout has a core method which is called ComponentPlugin. Is used in orde
 
 ### ShortCuts Service
 
-Another Core Service of Wax for registering shortcuts within a service. Check as an example , how it is used on Strong [Service](https://github.com/christos8333/wax-prosemirror/blob/master/wax-prosemirror-services/src/InlineAnnotations/StrongService/StrongService.js).
+Another Core Service of Wax for registering shortcuts within a service. Check as an example , how it is used on Strong [Service](https://gitlab.coko.foundation/wax/wax-prosemirror/blob/master/wax-prosemirror-services/src/InlineAnnotations/StrongService/StrongService.js).
 
 ### Rules Service
 
-Core Service of Wax for registering prosemirror rules. Check editoria [config](https://github.com/christos8333/wax-prosemirror/blob/master/wax-prosemirror-core/src/config/defaultConfig.js) or it can be used
+Core Service of Wax for registering prosemirror rules. Check editoria [config](https://gitlab.coko.foundation/wax/wax-prosemirror/blob/master/wax-prosemirror-core/src/config/defaultConfig.js) or it can be used
 from within any service similar to Short Cuts as an `addRule` method is available.
 
 ### Menu Service
@@ -387,20 +408,20 @@ Is used for adding menus to the editor.
 
 ## Other Stuff
 
-1.  How to create overlays. Check as an example the [link overlay](https://github.com/christos8333/wax-prosemirror/blob/master/wax-prosemirror-services/src/LinkService), which uses Wax's default overlay.
-2.  How to create toolgroups Check as an example Inline Annotations [here](https://github.com/christos8333/wax-prosemirror/blob/master/wax-prosemirror-services/src/InlineAnnotations) for the services and [here](https://github.com/christos8333/wax-prosemirror/blob/master/wax-prosemirror-services/src/WaxToolGroups/AnnotationToolGroupService) for creating your toolgroup
+1.  How to create overlays. Check as an example the [link overlay](https://gitlab.coko.foundation/wax/wax-prosemirror/blob/master/wax-prosemirror-services/src/LinkService), which uses Wax's default overlay.
+2.  How to create toolgroups Check as an example Inline Annotations [here](https://gitlab.coko.foundation/wax/wax-prosemirror/blob/master/wax-prosemirror-services/src/InlineAnnotations) for the services and [here](https://gitlab.coko.foundation/wax/wax-prosemirror/blob/master/wax-prosemirror-services/src/WaxToolGroups/AnnotationToolGroupService) for creating your toolgroup
 3.  How to create modals inside the editor (under development)
-4.  Adding prosemirror plugins. You can do it either from the config or from inside any service with `PmPlugins.add("shortcuts", shortCuts)` or you can have access to the plugin by [`pmplugins.get("imagePlaceHolder")`](https://github.com/christos8333/wax-prosemirror/blob/master/wax-prosemirror-services/src/ImageService/Image.js#L30)
+4.  Adding prosemirror plugins. You can do it either from the config or from inside any service with `PmPlugins.add("shortcuts", shortCuts)` or you can have access to the plugin by [`pmplugins.get("imagePlaceHolder")`](https://gitlab.coko.foundation/wax/wax-prosemirror/blob/master/wax-prosemirror-services/src/ImageService/Image.js#L30)
 5.  Exclude certain tool from toolgroups. `toolGroups: [{name: "Base", exclude: ['Undo']}, "Annotations", "Notes", "Lists", "Images", "Tables"]`
 6.  Adding certain tools into more section `toolGroups: [ "Base", { name: "Annotations", more: ["Superscript", "Subscript", "SmallCaps"] } ]`
 
 ## Latest versions
 
-- wax-prosemirror-components@0.0.11
-- wax-prosemirror-core@0.0.11
-- wax-prosemirror-layouts@0.0.11
-- wax-prosemirror-plugins@0.0.11
-- wax-prosemirror-schema@0.0.11
-- wax-prosemirror-services@0.0.11
-- wax-prosemirror-themes@0.0.11
-- wax-prosemirror-utilities@0.0.11
+- wax-prosemirror-components@0.0.16
+- wax-prosemirror-core@0.0.16
+- wax-prosemirror-layouts@0.0.16
+- wax-prosemirror-plugins@0.0.16
+- wax-prosemirror-schema@0.0.16
+- wax-prosemirror-services@0.0.16
+- wax-prosemirror-themes@0.0.16
+- wax-prosemirror-utilities@0.0.16
diff --git a/wax-prosemirror-components/package.json b/wax-prosemirror-components/package.json
index 3a58227a19520890058a8da70c1581a46afe8c2c..974a7e4cea92e6236a141dd2e33186f8a3bdeaf2 100644
--- a/wax-prosemirror-components/package.json
+++ b/wax-prosemirror-components/package.json
@@ -4,7 +4,7 @@
   "version": "0.0.16",
   "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/link/LinkComponent.js b/wax-prosemirror-components/src/components/link/LinkComponent.js
index 8c4b32a8d8699758e7ccd677c9af3cd225dd43df..da2b9e74c0d5b889951cf5c941dab50f94af4643 100644
--- a/wax-prosemirror-components/src/components/link/LinkComponent.js
+++ b/wax-prosemirror-components/src/components/link/LinkComponent.js
@@ -22,10 +22,7 @@ const Button = styled.button`
 const LinkComponent = ({ mark, setPosition, position }) => {
   const href = mark ? mark.attrs.href : null;
   const linkMark = mark ? mark : null;
-  const {
-    view: { main },
-    activeView,
-  } = useContext(WaxContext);
+  const { activeView } = useContext(WaxContext);
   const { state, dispatch } = activeView;
   const ref = useRef(null);
   const linkInput = useRef(null);
@@ -57,7 +54,8 @@ const LinkComponent = ({ mark, setPosition, position }) => {
   };
 
   const removeLink = () => {
-    dispatch(state.tr.removeMark(mark.from, mark.to, state.schema.marks.link));
+    const { tr } = state;
+    dispatch(tr.removeMark(mark.from, mark.to, state.schema.marks.link));
     activeView.focus();
   };
 
@@ -90,7 +88,7 @@ const LinkComponent = ({ mark, setPosition, position }) => {
       selection: { $from, $to },
     } = state;
     const PMLinkMark = state.schema.marks['link'];
-    const actualMark = DocumentHelpers.getSelectionMark(state, PMLinkMark);
+    const actualMark = DocumentHelpers.findMark(state, PMLinkMark);
     setLLastLinkMark(actualMark);
 
     if (
diff --git a/wax-prosemirror-core/package.json b/wax-prosemirror-core/package.json
index a8e57976fd75455641ba8780bf33b7d52b85c4f3..7829d1e707a4b879f3092c2be8e263315b006bea 100644
--- a/wax-prosemirror-core/package.json
+++ b/wax-prosemirror-core/package.json
@@ -4,7 +4,7 @@
   "version": "0.0.16",
   "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-layouts/package.json b/wax-prosemirror-layouts/package.json
index 3b5d0f4c0ac4946cd6dd89f5bb6fe3064cc07228..89e05ab5a27798520683a984e45c0ba1b4e310c9 100644
--- a/wax-prosemirror-layouts/package.json
+++ b/wax-prosemirror-layouts/package.json
@@ -4,7 +4,7 @@
   "version": "0.0.16",
   "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 6b89d1f3a4310c830023e7ad6fb6e6d286ebbdc0..03eff42cff0205ce115a88eb3fef0e92357f715f 100644
--- a/wax-prosemirror-plugins/package.json
+++ b/wax-prosemirror-plugins/package.json
@@ -4,7 +4,7 @@
   "version": "0.0.16",
   "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 929c1e26dfd1c65e3f8b4d18bbf1a2b95a733497..4b64ae3a27c358d954f85372c896aa1d640b4be3 100644
--- a/wax-prosemirror-schema/package.json
+++ b/wax-prosemirror-schema/package.json
@@ -4,7 +4,7 @@
   "version": "0.0.16",
   "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-services/package.json b/wax-prosemirror-services/package.json
index b680d693cde3a047f659eabadfb6d27f9f0a2a3c..219a5a413cec3013ec5919b5e35caac41a92337f 100644
--- a/wax-prosemirror-services/package.json
+++ b/wax-prosemirror-services/package.json
@@ -4,7 +4,7 @@
   "version": "0.0.16",
   "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/OverlayService/usePosition.js b/wax-prosemirror-services/src/OverlayService/usePosition.js
index dc2738477299a21895b39f42f481d2bd2f82e668..6d3b3a4667b319ddc01904b4b6385a1726cc3084 100644
--- a/wax-prosemirror-services/src/OverlayService/usePosition.js
+++ b/wax-prosemirror-services/src/OverlayService/usePosition.js
@@ -1,22 +1,25 @@
-import { useState, useContext, useLayoutEffect, useCallback } from "react";
-import { isObject } from "lodash";
-import { WaxContext } from "wax-prosemirror-core";
-import { DocumentHelpers } from "wax-prosemirror-utilities";
+import { useState, useContext, useLayoutEffect, useCallback } from 'react';
+import { isObject } from 'lodash';
+import { WaxContext } from 'wax-prosemirror-core';
+import { DocumentHelpers } from 'wax-prosemirror-utilities';
 
 const defaultOverlay = {
   left: null,
   top: null,
   from: null,
   to: null,
-  mark: null
+  mark: null,
 };
 
 export default options => {
-  const { view: { main }, activeView } = useContext(WaxContext);
+  const {
+    view: { main },
+    activeView,
+  } = useContext(WaxContext);
 
   const [position, setPosition] = useState({
-    position: "absolute",
-    ...defaultOverlay
+    position: 'absolute',
+    ...defaultOverlay,
   });
 
   let mark = {};
@@ -34,7 +37,7 @@ export default options => {
     const top = end.top + 20;
     return {
       top,
-      left
+      left,
     };
   };
 
@@ -48,14 +51,14 @@ export default options => {
       top,
       from,
       to,
-      selection
+      selection,
     };
   };
 
   const displayOnMark = (activeView, options) => {
     const { markType, followCursor } = options;
     const PMmark = activeView.state.schema.marks[markType];
-    mark = DocumentHelpers.getSelectionMark(activeView.state, PMmark);
+    mark = DocumentHelpers.findMark(activeView.state, PMmark);
 
     if (!isObject(mark)) return defaultOverlay;
     const { from, to } = followCursor ? activeView.state.selection : mark;
@@ -67,7 +70,7 @@ export default options => {
       top,
       from,
       to,
-      mark
+      mark,
     };
   };
 
@@ -81,15 +84,12 @@ export default options => {
     return displayOnMark(activeView, options);
   });
 
-  useLayoutEffect(
-    () => {
-      setPosition({
-        position: "absolute",
-        ...updatePosition(options.followCursor)
-      });
-    },
-    [JSON.stringify(updatePosition(options.followCursor))]
-  );
+  useLayoutEffect(() => {
+    setPosition({
+      position: 'absolute',
+      ...updatePosition(options.followCursor),
+    });
+  }, [JSON.stringify(updatePosition(options.followCursor))]);
 
   return [position, setPosition, mark];
 };
diff --git a/wax-prosemirror-themes/package.json b/wax-prosemirror-themes/package.json
index be313502711492f174e2a331e26660492fd20685..d76ccd548c6ec5eaf233613ac2a6e9d05ff45679 100644
--- a/wax-prosemirror-themes/package.json
+++ b/wax-prosemirror-themes/package.json
@@ -4,7 +4,7 @@
   "version": "0.0.16",
   "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 11c08b7315166b71632ed6871734fdccb8ea6a1f..7abc880664740b89321390ab11f4fc7ea8424da8 100644
--- a/wax-prosemirror-utilities/package.json
+++ b/wax-prosemirror-utilities/package.json
@@ -4,7 +4,7 @@
   "version": "0.0.16",
   "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"
diff --git a/wax-prosemirror-utilities/src/document/DocumentHelpers.js b/wax-prosemirror-utilities/src/document/DocumentHelpers.js
index 3e2caffbbde97bf6c1d23bbaf723837b6d78b507..02d6cbfbd4f26eced8bcc24bfbe19ecce9efc770 100644
--- a/wax-prosemirror-utilities/src/document/DocumentHelpers.js
+++ b/wax-prosemirror-utilities/src/document/DocumentHelpers.js
@@ -25,27 +25,27 @@ const findMark = (state, PMmark, toArr = false) => {
   return markFound;
 };
 
-const getSelectionMark = (state, PMmark) => {
-  const {
-    selection: { $from, $to },
-    doc,
-  } = state;
-  let markFound;
-  doc.nodesBetween($from.pos, $to.pos, (node, from) => {
-    if (node.marks) {
-      const actualMark = node.marks.find(mark => mark.type === PMmark);
-      if (actualMark) {
-        markFound = {
-          from: $from.pos,
-          to: $to.pos,
-          attrs: actualMark.attrs,
-        };
-      }
-    }
-  });
-
-  return markFound;
-};
+// const getSelectionMark = (state, PMmark) => {
+//   const {
+//     selection: { $from, $to },
+//     doc,
+//   } = state;
+//   let markFound;
+//   doc.nodesBetween($from.pos, $to.pos, (node, from) => {
+//     if (node.marks) {
+//       const actualMark = node.marks.find(mark => mark.type === PMmark);
+//       if (actualMark) {
+//         markFound = {
+//           from,
+//           to: from + node.nodeSize,
+//           attrs: actualMark.attrs,
+//         };
+//       }
+//     }
+//   });
+//
+//   return markFound;
+// };
 
 /* this is a workaround for now to find marks
   that are pm will break them.
@@ -104,11 +104,17 @@ const findMarkPosition = (activeView, initialPos, markType) => {
   const actualMark = start.node.marks.find(mark => mark.type.name === markType);
   let startIndex = $pos.index();
   let startPos = $pos.start() + start.offset;
-  while (startIndex > 0 && actualMark.isInSet(parent.child(startIndex - 1).marks))
+  while (
+    startIndex > 0 &&
+    actualMark.isInSet(parent.child(startIndex - 1).marks)
+  )
     startPos -= parent.child(--startIndex).nodeSize;
   let endIndex = $pos.indexAfter();
   let endPos = startPos + start.node.nodeSize;
-  while (endPos < parent.childCount && actualMark.isInSet(parent.child(endIndex).marks))
+  while (
+    endPos < parent.childCount &&
+    actualMark.isInSet(parent.child(endIndex).marks)
+  )
     endPos += parent.child(endIndex++).nodeSize;
   return { from: startPos, to: endPos };
 };
@@ -163,7 +169,6 @@ export default {
   findInlineNodes,
   findChildrenByMark,
   findChildrenByAttr,
-  getSelectionMark,
   findFragmentedMark,
   findAllMarksWithSameId,
   findMarkPosition,