diff --git a/.gitignore b/.gitignore
index b72f34f47..504fad6c9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,4 @@ dkm-commandlist.txt
 */.project
 */.settings
 *.versionsBackup
+*#
\ No newline at end of file
diff --git a/docs/download.html b/docs/download.html
index d5c2d733c..7d6ff92c7 100644
--- a/docs/download.html
+++ b/docs/download.html
@@ -351,7 +351,28 @@ <h2 id="Recompiling_PIKES_from_sources"><a name="sources" class="anchor" id="sou
 </pre> 
   </div> 
  </div> 
- <p>You’ll get the <tt>pikes-tintop-1.0-SNAPSHOT-jar-with-dependencies.jar</tt> package into the <tt>pikes-tintop/target/</tt> folder. Just copy it to the running folder and restart PIKES.</p> 
+ <p>You’ll get the <tt>pikes-tintop-1.0-SNAPSHOT-jar-with-dependencies.jar</tt> package into the <tt>pikes-tintop/target/</tt> folder. Just copy it to the running folder and restart PIKES.</p>
+ <p>
+   In the event that there are build issues with the <i>devel</i> branches, you may want to check out the master branches instead (which reference an earlier version of the Stanford Core). To get the unit tests to run on the master branch, you may need to make pointers to certain models in the working downloadable version(unix-centric instructions):
+   <ul>
+     <li>Follow the <a href=#download>instructions above</a> to download the working version. Let's say that's in the $DOWNLOADED_PIKES directory.
+   </li>
+     <li>
+       Make symbolic links from the ./pikes directory to certain data models:
+       <pre>
+         ln -sf $DOWLOADED_PIKES/models models
+         ln -sf $DOWNLOADED_PIKES/wordnet wordnet
+         ln -sf $DOWNLOADED_PIKES/ukb ukb
+       </pre>
+     </li>
+     <li>
+       If you see complaints about not being able to run UKB libraries, you may need to follow the <a href=#mac>instructions above</a> for installing UKB natively on your machine.
+     </li>
+   </ul>
+ </p>
+ <p>
+   After following the above instructions, you should be able to run all of the unit tests for the master branch in your favorite IDE, and step through the code.
+   </p>
 </div>
 			</div>
 		</div>
diff --git a/pikes-tintop/pom.xml b/pikes-tintop/pom.xml
index 1df23ea6c..03ec515ca 100644
--- a/pikes-tintop/pom.xml
+++ b/pikes-tintop/pom.xml
@@ -211,6 +211,20 @@
             <artifactId>Semafor</artifactId>
             <version>3.0-alpha-04</version>
         </dependency>
+        <!-- https://mvnrepository.com/artifact/uk.ac.susx.informatics/morpha-stemmer -->
+        <dependency>
+          <groupId>uk.ac.susx.informatics</groupId>
+          <artifactId>morpha-stemmer</artifactId>
+          <version>1.0.1</version>
+        </dependency>
+        <!-- https://mvnrepository.com/artifact/org.pcollections/pcollections -->
+        <dependency>
+            <groupId>org.pcollections</groupId>
+            <artifactId>pcollections</artifactId>
+            <version>2.1.2</version>
+        </dependency>
+
+
 
     </dependencies>
 
diff --git a/pikes-tintop/src/main/java/eu/fbk/dkm/pikes/tintop/annotators/Defaults.java b/pikes-tintop/src/main/java/eu/fbk/dkm/pikes/tintop/annotators/Defaults.java
index 8a1cfdd4c..53564f4cd 100644
--- a/pikes-tintop/src/main/java/eu/fbk/dkm/pikes/tintop/annotators/Defaults.java
+++ b/pikes-tintop/src/main/java/eu/fbk/dkm/pikes/tintop/annotators/Defaults.java
@@ -97,7 +97,8 @@ public static Properties classProperties() {
     public static final String MATE_MODEL_BE = MODEL_FOLDER + "mate_be.model";
 
     public static final String DBPS_ANNOTATOR = "dbpedia-candidates";
-    public static final String DBPS_ADDRESS = "http://spotlight.sztaki.hu:2222/rest";
+
+    public static final String DBPS_ADDRESS = "https://api.dbpedia-spotlight.org/en";
     public static final double DBPSC_MIN_CONFIDENCE = 0.01;
     public static final double DBPSC_FIRST_CONFIDENCE = 0.5;
     public static final double DBPS_MIN_CONFIDENCE = 0.33;
diff --git a/pikes-tintop/src/test/java/eu/fbk/dkm/pikes/tintop/MorphTest.java b/pikes-tintop/src/test/java/eu/fbk/dkm/pikes/tintop/MorphTest.java
deleted file mode 100644
index 9b3123ac8..000000000
--- a/pikes-tintop/src/test/java/eu/fbk/dkm/pikes/tintop/MorphTest.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package eu.fbk.dkm.pikes.tintop;
-
-import edu.stanford.nlp.pipeline.Annotation;
-import edu.stanford.nlp.pipeline.StanfordCoreNLP;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.util.Properties;
-
-/**
- * Created by alessio on 08/06/16.
- */
-
-public class MorphTest {
-
-    private static final Logger LOGGER = LoggerFactory.getLogger(MorphTest.class);
-
-    public static void main(String[] args) throws InterruptedException {
-        Properties props = new Properties();
-        props.setProperty("annotators", "tokenize, ssplit, pos, ita_morpho, ita_lemma");
-        props.setProperty("customAnnotatorClass.ita_lemma", "eu.fbk.dh.digimorph.annotator.DigiLemmaAnnotator");
-        props.setProperty("customAnnotatorClass.ita_morpho", "eu.fbk.dh.digimorph.annotator.DigiMorphAnnotator");
-
-        props.setProperty("tokenize.language", "Spanish");
-        props.setProperty("ssplit.newlineIsSentenceBreak", "always");
-
-        props.setProperty("pos.model", "/Users/alessio/Documents/Resources/ita-models/italian5.tagger");
-
-        props.setProperty("ita_morpho.model", "/Users/alessio/Documents/Resources/ita-models/italian.db");
-
-        StanfordCoreNLP pipeline = new StanfordCoreNLP(props);
-
-        LOGGER.info("Annotating");
-
-        for (int i = 0; i < 50; i++) {
-            Annotation annotation = new Annotation("Questa è una prova.");
-            pipeline.annotate(annotation);
-        }
-
-        LOGGER.info("Finishing");
-
-        Thread.sleep(60000);
-    }
-}
diff --git a/pikes-tintop/src/test/java/eu/fbk/dkm/pikes/tintop/Ontonotes2Giulio.java b/pikes-tintop/src/test/java/eu/fbk/dkm/pikes/tintop/Ontonotes2Giulio.java
deleted file mode 100644
index 37d407244..000000000
--- a/pikes-tintop/src/test/java/eu/fbk/dkm/pikes/tintop/Ontonotes2Giulio.java
+++ /dev/null
@@ -1,99 +0,0 @@
-package eu.fbk.dkm.pikes.tintop;
-
-import eu.fbk.dkm.pikes.resources.util.corpus.*;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.io.BufferedWriter;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Set;
-
-/**
- * Created by alessio on 20/01/16.
- */
-
-public class Ontonotes2Giulio {
-
-    private static final Logger LOGGER = LoggerFactory.getLogger(Ontonotes2Giulio.class);
-
-    public static void main(String[] args) throws IOException {
-        String inputFile = args[0];
-        String outputFile = args[1];
-
-        Corpus corpus = Corpus.readDocumentFromFile(inputFile, "ontonotes-5");
-        BufferedWriter writer = new BufferedWriter(new FileWriter(outputFile));
-
-        for (Sentence sentence : corpus) {
-
-            HashMap<String, StringBuffer> buffers = new HashMap<>();
-            ArrayList<StringBuffer> additionalBuffers = new ArrayList<>();
-
-            buffers.put("id", new StringBuffer());
-            buffers.put("form", new StringBuffer());
-            buffers.put("lemma", new StringBuffer());
-            buffers.put("pos", new StringBuffer());
-            buffers.put("deplabel", new StringBuffer());
-            buffers.put("depparent", new StringBuffer());
-
-            for (Word word : sentence) {
-                buffers.get("id").append(word.getId()).append('\t');
-                buffers.get("form").append(word.getForm()).append('\t');
-                buffers.get("lemma").append(word.getLemma()).append('\t');
-                buffers.get("pos").append(word.getPos()).append('\t');
-                buffers.get("deplabel").append(word.getDepLabel()).append('\t');
-                buffers.get("depparent").append(word.getDepParent()).append('\t');
-            }
-
-            for (Srl srl : sentence.getSrls()) {
-                StringBuffer stringBuffer = new StringBuffer();
-                HashMap<Integer, String> tokens = new HashMap<>();
-
-                for (Word word : srl.getTarget()) {
-                    tokens.put(word.getId(), srl.getLabel());
-                }
-                for (Role role : srl.getRoles()) {
-                    for (Word word : role.getSpan()) {
-                        Set<Integer> descendants = sentence.getDescendants(word.getId());
-                        for (Integer descendant : descendants) {
-                            tokens.put(descendant, role.getLabel());
-                        }
-                    }
-                }
-
-                for (int i = 0; i < sentence.getWords().size(); i++) {
-                    String s = tokens.get(i + 1);
-                    if (s != null) {
-                        stringBuffer.append(s);
-                    }
-                    else {
-                        stringBuffer.append("-");
-                    }
-                    stringBuffer.append('\t');
-                }
-
-                additionalBuffers.add(stringBuffer);
-            }
-
-            writer.append(buffers.get("id").toString().trim()).append('\n');
-            writer.append(buffers.get("form").toString().trim()).append('\n');
-            writer.append(buffers.get("lemma").toString().trim()).append('\n');
-            writer.append(buffers.get("pos").toString().trim()).append('\n');
-            writer.append(buffers.get("deplabel").toString().trim()).append('\n');
-            writer.append(buffers.get("depparent").toString().trim()).append('\n');
-
-            for (StringBuffer buffer : additionalBuffers) {
-                String s = buffer.toString();
-                s = s.substring(0, s.length() - 1);
-                writer.append(s).append('\n');
-            }
-
-            writer.append('\n');
-        }
-
-        writer.close();
-
-    }
-}
diff --git a/pikes-twm/src/main/java/eu/fbk/dkm/pikes/twm/DBpediaSpotlightAnnotate.java b/pikes-twm/src/main/java/eu/fbk/dkm/pikes/twm/DBpediaSpotlightAnnotate.java
index b175aa36b..87c9be447 100644
--- a/pikes-twm/src/main/java/eu/fbk/dkm/pikes/twm/DBpediaSpotlightAnnotate.java
+++ b/pikes-twm/src/main/java/eu/fbk/dkm/pikes/twm/DBpediaSpotlightAnnotate.java
@@ -19,7 +19,7 @@ public class DBpediaSpotlightAnnotate extends Linking {
 
     private static String LABEL = "dbpedia-annotate";
     private String confidence;
-    public static final String DBPS_ADDRESS = "http://spotlight.sztaki.hu:2222/rest";
+    public static final String DBPS_ADDRESS = "https://api.dbpedia-spotlight.org/en";
     public static final double DBPS_MIN_CONFIDENCE = 0.33;
 
     public DBpediaSpotlightAnnotate(Properties properties) {
diff --git a/pom.xml b/pom.xml
index d0eba245b..51e09c04e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -41,6 +41,11 @@
             <id>fbk-repo</id>
             <url>https://raw.githubusercontent.com/fbk/mvn-repo/master/releases</url>
         </repository>
+        <repository> <!-- home to morpha-stemmer -->
+          <id>KnowItAll</id>
+          <url>http://knowitall.cs.washington.edu/maven2/</url>
+        </repository>
+        
     </repositories>
 
     <developers>