diff --git a/.classpath b/.classpath
index 528de5655..d9f48fb6a 100644
--- a/.classpath
+++ b/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="lib" path="build/solrjars-extracted/lucene-test-framework-4.8-SNAPSHOT.jar" sourcepath="build/solr-download/apache-solr-4.0.0-SVN/lucene/test-framework/src/java"/>
-	<classpathentry kind="lib" path="build/solrjars-extracted/solr-test-framework-4.8-SNAPSHOT.jar" sourcepath="build/solr-download/apache-solr-4.0.0-SVN/lucene/core/src"/>
+	<classpathentry kind="lib" path="build/solrjars-extracted/solr-test-framework-4.8-SNAPSHOT.jar" sourcepath="/solr-next"/>
 	<classpathentry kind="src" path="contrib/antlrqueryparser/src/java"/>
 	<classpathentry kind="src" path="contrib/adsabs/src/jython"/>
 	<classpathentry kind="src" path="contrib/antlrqueryparser/src/test"/>
diff --git a/.project b/.project
index 725aaa948..005ef8e1e 100644
--- a/.project
+++ b/.project
@@ -3,6 +3,7 @@
 	<name>montysolr-next</name>
 	<comment></comment>
 	<projects>
+		<project>solr-next</project>
 	</projects>
 	<buildSpec>
 		<buildCommand>
diff --git a/build.xml b/build.xml
index c94240e71..e60b94bb3 100644
--- a/build.xml
+++ b/build.xml
@@ -130,12 +130,14 @@
 
 
 
-	<target name="test" depends="write-properties">
-		   <antcall target="common.test" inheritall="true" inheritrefs="true"/>
-	</target>
+	<target name="test" depends="write-properties" description="Run tests for core and contrib">
+    <antcall target="common.test" inheritall="true" inheritrefs="true"/>
+    <antcall target="test-contrib" inheritall="true" inheritrefs="true"/>
+  </target>
 
     
-	<target name="test-all" depends="test,test-contrib" description="Run tests for core and contrib"/>
+  <!-- obsolete: redirecting to test -->
+  <target name="test-all" depends="test" />
     
 	
 	<!-- writes into a simple format various config variables, they can be used by unittests/java -->
diff --git a/contrib/adsabs/src/test/org/adsabs/TestAdsAllFields.java b/contrib/adsabs/src/test/org/adsabs/TestAdsAllFields.java
index 9b3837298..b8f28bade 100644
--- a/contrib/adsabs/src/test/org/adsabs/TestAdsAllFields.java
+++ b/contrib/adsabs/src/test/org/adsabs/TestAdsAllFields.java
@@ -195,7 +195,7 @@ public void test() throws Exception {
 				", \"alternate_title\": \"This is of the alternate\"" +
 				", \"abstract\": \"all no-sky survey q'i quotient\"" +
 				
-				", \"keyword\": [\"Classical statistical mechanics\"]" +
+				", \"keyword\": [\"Classical statistical mechanics\", \"foo bar\"]" +
 				", \"keyword_norm\": [\"angular momentum\", \"89.20.Hh\"]" +
 				", \"keyword_schema\": [\"ADS\", \"PACS Codes\"]" +
 				", \"keyword_facet\": [\"angular momentum kw\"]" +
@@ -504,6 +504,10 @@ public void test() throws Exception {
 				"//*[@numFound='1']",
 				"//doc/int[@name='recid'][.='100']"
 		);
+		assertQ(req("q", "keyword:\"foo bar\""), 
+				"//*[@numFound='1']",
+				"//doc/int[@name='recid'][.='100']"
+		);
 		assertQ(req("q", "keyword:\"Classical Statistical Mechanics\""), // should be case-insensitive 
 				"//*[@numFound='1']",
 				"//doc/int[@name='recid'][.='100']"
@@ -520,7 +524,7 @@ public void test() throws Exception {
 		);
 
 		assertQ(req("q", "keyword_norm:classical"), "//*[@numFound='0']"); // should not contain keywords
-		assertQ(req("q", "keyword:89.20.Hh"), "//*[@numFound='1']"); // should contain keywords_norm
+		assertQ(req("q", "keyword:89.20.Hh"), "//*[@numFound='0']"); // should not contain keywords_norm
 		
 		
 		/*
diff --git a/contrib/examples/adsabs/solr/collection1/conf/schema.xml b/contrib/examples/adsabs/solr/collection1/conf/schema.xml
index 4f38a612e..09dd9de31 100644
--- a/contrib/examples/adsabs/solr/collection1/conf/schema.xml
+++ b/contrib/examples/adsabs/solr/collection1/conf/schema.xml
@@ -451,10 +451,12 @@
 
 				<!-- remove stop words - first the case sensitively -->
 				<filter class="solr.StopFilterFactory" ignoreCase="false"
-					words="text.kill_sens" enablePositionIncrements="false" />
+					words="text.kill_sens" enablePositionIncrements="false" 
+					luceneMatchVersion="4.3"/>
 				<!-- remove stop words - then case insensitively -->
 				<filter class="solr.StopFilterFactory" ignoreCase="true"
-					words="text.kill" enablePositionIncrements="false" />
+					words="text.kill" enablePositionIncrements="false" 
+					luceneMatchVersion="4.3"/>
 
 
 
@@ -537,10 +539,12 @@
 
 				<!-- remove stop words - first the case sensitively -->
 				<filter class="solr.StopFilterFactory" ignoreCase="false"
-					words="text.kill_sens" enablePositionIncrements="false" />
+					words="text.kill_sens" enablePositionIncrements="false" 
+					luceneMatchVersion="4.3"/>
 				<!-- remove stop words - then case insensitively -->
 				<filter class="solr.StopFilterFactory" ignoreCase="true"
-					words="text.kill" enablePositionIncrements="false" />
+					words="text.kill" enablePositionIncrements="false" 
+					luceneMatchVersion="4.3"/>
 
 
 
@@ -609,10 +613,12 @@
         
         <!-- remove stop words - first the case sensitively -->
         <filter class="solr.StopFilterFactory" ignoreCase="false"
-          words="text.kill_sens" enablePositionIncrements="false" />
+          words="text.kill_sens" enablePositionIncrements="false" 
+          luceneMatchVersion="4.3"/>
         <!-- remove stop words - then case insensitively -->
         <filter class="solr.StopFilterFactory" ignoreCase="true"
-          words="text.kill" enablePositionIncrements="false" />
+          words="text.kill" enablePositionIncrements="false" 
+          luceneMatchVersion="4.3"/>
 
 
 
@@ -679,6 +685,8 @@
 				<filter class="solr.PatternReplaceFilterFactory" pattern="(doi:|arxiv:)"
 					replacement="" replace="all" />
 				<filter class="solr.TrimFilterFactory" />
+				<filter
+          class="org.apache.lucene.analysis.miscellaneous.RemoveDuplicatesTokenFilterFactory" />
 			</analyzer>
 			<analyzer type="query">
 				<tokenizer class="solr.KeywordTokenizerFactory" />
@@ -773,6 +781,8 @@
 				<filter class="solr.PatternReplaceFilterFactory" pattern="(\-|_| )"
           replacement="" replace="all" />
 				<filter class="solr.TrimFilterFactory" />
+				<filter
+          class="org.apache.lucene.analysis.miscellaneous.RemoveDuplicatesTokenFilterFactory" />
 			</analyzer>
 			<analyzer type="query">
 				<tokenizer class="solr.KeywordTokenizerFactory" />
@@ -1050,6 +1060,8 @@
 
 		<field name="page" type="first_string" indexed="true" stored="true"
 			multiValued="true" omitNorms="true" omitTermFreqAndPositions="true"/>
+	  <field name="eid" type="first_string" indexed="true" stored="true"
+      multiValued="true" omitNorms="true" omitTermFreqAndPositions="true"/>
 			
 		<field name="year" type="first_string" indexed="true" stored="true" 
 			multiValued="false" omitNorms="true" omitTermFreqAndPositions="true"/>
@@ -1079,9 +1091,6 @@
 		<field name="pubdate" type="date_string" indexed="true" stored="true"
 			omitNorms="true" omitTermFreqAndPositions="true"/>
 			
-		<field name="pubdate_sort" type="int" indexed="true" stored="${storeAll:false}"
-			omitNorms="true" omitTermFreqAndPositions="true"/>
-
 
 		<field name="title" type="ads_text" indexed="true" stored="true" 
       multiValued="true" termVectors="true" termOffsets="true" 
@@ -1460,33 +1469,7 @@
 	<solrQueryParser defaultOperator="AND" />
 
 	<copyField source="id" dest="recid" />
-
-  <copyField source="arxiv_class" dest="keyword" />
-	<copyField source="keyword_norm" dest="keyword" />
 	
-	<copyField source="bibgroup" dest="bibgroup_facet" />
-	<copyField source="data" dest="data_facet" />
-	<copyField source="vizier" dest="vizier_facet" />
-
-	<copyField source="a_100" dest="author" />
-	<copyField source="a_700" dest="author" />
-
-	<copyField source="a_100_norm" dest="author_norm" />
-	<copyField source="a_700_norm" dest="author_norm" />
-
-	<copyField source="a_100_norm" dest="author_facet" />
-	<copyField source="a_700_norm" dest="author_facet" />
-
-	<copyField source="a_100" dest="first_author" />
-	<copyField source="a_100_norm" dest="first_author_norm" />
-
-  <copyField source="tmp_aff_100" dest="aff" />
-  <copyField source="tmp_aff_700" dest="aff" />
-  
-  <copyField source="tmp_email_100" dest="email" />
-  <copyField source="tmp_email_700" dest="email" />
-  
-  
   <copyField source="bibcode" dest="identifier" />
   <copyField source="alternate_bibcode" dest="identifier" />
   <copyField source="doi" dest="identifier" />
diff --git a/contrib/examples/adsabs/solr/collection1/conf/solrconfig.xml b/contrib/examples/adsabs/solr/collection1/conf/solrconfig.xml
index 25419e330..cb7d849ae 100644
--- a/contrib/examples/adsabs/solr/collection1/conf/solrconfig.xml
+++ b/contrib/examples/adsabs/solr/collection1/conf/solrconfig.xml
@@ -1,70 +1,11 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements.  See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License.  You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<!-- 
-     For more details about configurations options that may appear in
-     this file, see http://wiki.apache.org/solr/SolrConfigXml. 
--->
-<config>
-  <!-- In all configuration below, a prefix of "solr." for class names
-       is an alias that causes solr to search appropriate packages,
-       including org.apache.solr.(search|update|request|core|analysis)
-
-       You may also specify a fully qualified Java classname if you
-       have your own custom plugins.
-    -->
-
-  <!-- Controls what version of Lucene various components of Solr
-       adhere to.  Generally, you want to use the latest version to
-       get all bug fixes and improvements. It is highly recommended
-       that you fully re-index after changing this setting as it can
-       affect both how text is indexed and queried.
-  -->
-  <luceneMatchVersion>LUCENE_40</luceneMatchVersion>
 
-  <!-- lib directives can be used to instruct Solr to load an Jars
-       identified and use them to resolve any "plugins" specified in
-       your solrconfig.xml or schema.xml (ie: Analyzers, Request
-       Handlers, etc...).
+<config>
 
-       All directories and paths are resolved relative to the
-       instanceDir.
+  <luceneMatchVersion>4.7</luceneMatchVersion>
 
-       If a "./lib" directory exists in your instanceDir, all files
-       found in it are included as if you had used the following
-       syntax...
-    -->       
-  
   <lib dir="../lib" />
 
-
-  <!-- A 'dir' option by itself adds any files found in the directory 
-       to the classpath, this is useful for including all jars in a
-       directory.
-    -->
-  <!--
-     <lib dir="../add-everything-found-in-this-dir-to-the-classpath" />
-  -->
-
-  <!-- When a 'regex' is specified in addition to a 'dir', only the
-       files in that directory which completely match the regex
-       (anchored on both ends) will be included.
-    -->
   <lib dir="../../../dist/" regex="apache-solr-cell-\d.*\.jar" />
   <lib dir="../../../contrib/extraction/lib" regex=".*\.jar" />
 
@@ -77,18 +18,6 @@
   <lib dir="../../../dist/" regex="apache-solr-velocity-\d.*\.jar" />
   <lib dir="../../../contrib/velocity/lib" regex=".*\.jar" />
 
-  <!-- If a 'dir' option (with or without a regex) is used and nothing
-       is found that matches, it will be ignored
-    -->
-  <lib dir="/total/crap/dir/ignored" /> 
-
-  <!-- an exact 'path' can be used instead of a 'dir' to specify a 
-       specific file.  This will cause a serious error to be logged if 
-       it can't be loaded.
-    -->
-  <!--
-     <lib path="../a-jar-that-does-not-exist.jar" /> 
-  -->
   
   <!-- Data Directory
 
@@ -100,30 +29,13 @@
   <dataDir>${solr.data.dir:}</dataDir>
 
 
-  <!-- The DirectoryFactory to use for indexes.
-       
-       solr.StandardDirectoryFactory is filesystem
-       based and tries to pick the best implementation for the current
-       JVM and platform.  solr.NRTCachingDirectoryFactory, the default,
-       wraps solr.StandardDirectoryFactory and caches small files in memory
-       for better NRT performance.
-
-       One can force a particular implementation via solr.MMapDirectoryFactory,
-       solr.NIOFSDirectoryFactory, or solr.SimpleFSDirectoryFactory.
-
-       solr.RAMDirectoryFactory is memory based, not
-       persistent, and doesn't work with replication.
-    -->
   <directoryFactory name="DirectoryFactory" 
                     class="${solr.directoryFactory:solr.NRTCachingDirectoryFactory}"/> 
 
-  <!-- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-       Index Config - These settings control low-level behavior of indexing
-       Most example settings here show the default value, but are commented
-       out, to more easily see where customizations have been made.
-       
-       Note: This replaces <indexDefaults> and <mainIndex> from older versions
-       ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->
+
+  <codecFactory class="solr.SchemaCodecFactory"/>
+  <schemaFactory class="ClassicIndexSchemaFactory"/>
+  
   <indexConfig>
     <!-- maxFieldLength was removed in 4.0. To get similar behavior, include a 
          LimitTokenCountFilterFactory in your fieldType definition. E.g. 
@@ -132,10 +44,16 @@
     <!-- Maximum time to wait for a write lock (ms) for an IndexWriter. Default: 1000 -->
     <!-- <writeLockTimeout>1000</writeLockTimeout>  -->
 
+    <!-- The maximum number of simultaneous threads that may be
+         indexing documents at once in IndexWriter; if more than this
+         many threads arrive they will wait for others to finish.
+         Default in Solr/Lucene is 8. -->
+    <maxIndexingThreads>8</maxIndexingThreads>
+    
     <!-- Expert: Enabling compound file will use less files for the index, 
          using fewer file descriptors on the expense of performance decrease. 
          Default in Lucene is "true". Default in Solr is "false" (since 3.6) -->
-    <!-- <useCompoundFile>false</useCompoundFile> -->
+    <useCompoundFile>false</useCompoundFile>
 
     <!-- ramBufferSizeMB sets the amount of RAM that may be used by Lucene
          indexing for buffering added documents and deletions before they are
@@ -143,9 +61,10 @@
          maxBufferedDocs sets a limit on the number of documents buffered
          before flushing.
          If both ramBufferSizeMB and maxBufferedDocs is set, then
-         Lucene will flush based on whichever limit is hit first.  -->
-    <!-- <ramBufferSizeMB>32</ramBufferSizeMB> -->
-    <!-- <maxBufferedDocs>1000</maxBufferedDocs> -->
+         Lucene will flush based on whichever limit is hit first.
+         The default is 100 MB.  -->
+    <ramBufferSizeMB>100</ramBufferSizeMB>
+    <maxBufferedDocs>5000</maxBufferedDocs>
 
     <!-- Expert: Merge Policy 
          The Merge Policy in Lucene controls how merging of segments is done.
@@ -226,12 +145,13 @@
       -->
     <!-- <termIndexInterval>128</termIndexInterval> -->
 
-    <!-- If true, IndexReaders will be reopened (often more efficient)
-         instead of closed and then opened. Default: true
-      -->
-    <!-- 
-    <reopenReaders>true</reopenReaders>
+    <!-- If true, IndexReaders will be opened/reopened from the IndexWriter
+         instead of from the Directory. Hosts in a master/slave setup
+         should have this set to false while those in a SolrCloud
+         cluster need to be set to true. Default: true
       -->
+    <nrtMode>false</nrtMode>
+
 
     <!-- Commit Deletion Policy
 
@@ -255,17 +175,14 @@
            This should be raised to 2 when there is a possibility of
            index corruption and disk space is available
       -->
-      <str name="maxCommitsToKeep">${montysolr.maxCommitsToKeep:1}</str>
+        <str name="maxCommitsToKeep">${montysolr.maxCommitsToKeep:1}</str>
       <!-- The number of optimized commit points to be kept -->
-      <!-- <str name="maxOptimizedCommitsToKeep">0</str> -->
+        <str name="maxOptimizedCommitsToKeep">0</str>
       <!--
           Delete all commit points once they have reached the given age.
           Supports DateMathParser syntax e.g.
         -->
-      <!--
-         <str name="maxCommitAge">30MINUTES</str>
          <str name="maxCommitAge">1DAY</str>
-      -->
      
     </deletionPolicy>
     
@@ -275,10 +192,11 @@
          To aid in advanced debugging, Lucene provides an "InfoStream"
          of detailed information when indexing.
 
-         Setting The value to true will instruct the underlying Lucene
-         IndexWriter to write its debugging info the specified file
+         Setting the value to true will instruct the underlying Lucene
+         IndexWriter to write its info stream to solr's log. By default,
+         this is enabled here, and controlled through log4j.properties.
       -->
-     <!-- <infoStream file="INFOSTREAM.txt">false</infoStream> --> 
+     <infoStream>true</infoStream>
   </indexConfig>
 
 
@@ -292,18 +210,22 @@
        For more details see http://wiki.apache.org/solr/SolrJmx
     -->
   <jmx />
-  <!-- If you want to connect to a particular server, specify the
-       agentId 
-    -->
-  <!-- <jmx agentId="myAgent" /> -->
-  <!-- If you want to start a new MBeanServer, specify the serviceUrl -->
-  <!-- <jmx serviceUrl="service:jmx:rmi:///jndi/rmi://localhost:9999/solr"/>
-    -->
+  
 
   <!-- The default high-performance update handler -->
   <updateHandler class="solr.DirectUpdateHandler2"
                  enable="${montysolr.enable.write:true}">
 
+    <!-- Enables a transaction log, used for real-time get, durability, and
+         and solr cloud replica recovery.  The log can grow as big as
+         uncommitted changes to the index, so use of a hard autoCommit
+         is recommended (see below).
+         "dir" - the target directory for transaction logs, defaults to the
+                solr data directory.  --> 
+    <updateLog>
+      <str name="dir">${solr.ulog.dir:}</str>
+    </updateLog>
+    
     <!-- AutoCommit
 
          Perform a hard commit automatically under certain conditions.