diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/search/indexing/IndexBuilder.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/search/indexing/IndexBuilder.java
index d87c40740..b2f6006e4 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/search/indexing/IndexBuilder.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/search/indexing/IndexBuilder.java
@@ -333,12 +333,15 @@ public class IndexBuilder {
                 if( (count % 100 ) == 0 && count > 0 ){
                     long dt = (System.currentTimeMillis() - starttime);
                     log.debug("individuals indexed: " + count + " in " + dt + " msec " +
-                            " time pre individual = " + (dt / count) + " msec");                         
+                             " time pre individual = " + (dt / count) + " msec" );                          
                 }                
             }                
         }
-        log.info("individuals indexed: " + count + " in " + (System.currentTimeMillis() - starttime) + " msec" +
-        		" time per individual = " + (System.currentTimeMillis() - starttime)/ count + " msec") ;
+        
+        log.info( 
+             "individuals indexed: " + count + " in " + (System.currentTimeMillis() - starttime) + " msec" +
+        	  (count!=0?(" time per individual = " + (System.currentTimeMillis() - starttime)/ count + " msec"):"")
+        );
     }
     
     /**
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/search/lucene/Entity2LuceneDoc.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/search/lucene/Entity2LuceneDoc.java
index 8ab9b4c0f..415077b9f 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/search/lucene/Entity2LuceneDoc.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/search/lucene/Entity2LuceneDoc.java
@@ -119,7 +119,7 @@ public class Entity2LuceneDoc  implements Obj2DocIface{
             //log.debug("Skipping individual without rdfs:label " + ent.getURI());
             //return null;
             log.debug("Using local name for individual with rdfs:label " + ent.getURI());
-            return ent.getLocalName();
+            value = ent.getLocalName();
         }
         Field name =new Field(term.NAME, value, 
                                Field.Store.YES, Field.Index.ANALYZED);
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/search/lucene/LuceneIndexer.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/search/lucene/LuceneIndexer.java
index a222ad7b3..1dc5be41c 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/search/lucene/LuceneIndexer.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/search/lucene/LuceneIndexer.java
@@ -203,28 +203,29 @@ public class LuceneIndexer implements IndexerIface {
         	if( urisIndexed.contains(ind.getURI()) ){
         		log.debug("already indexed " + ind.getURI() );
         		return;
-        	}else
+        	}else{
         		urisIndexed.add(ind.getURI());
-        	
-            Iterator<Obj2DocIface> it = getObj2DocList().iterator();
-            while (it.hasNext()) {
-                Obj2DocIface obj2doc = (Obj2DocIface) it.next();
-                if (obj2doc.canTranslate(ind)) {
-                	Document d = (Document) obj2doc.translate(ind);
-                	if( d != null){                		                		                		
-                		if( !newDoc ){                    	                    		
-                			writer.updateDocument((Term)obj2doc.getIndexId(ind), d);
-                			log.debug("updated " + ind.getName() + " " + ind.getURI());
-                		}else{                    	
-                    		writer.addDocument(d);
-                    		log.debug("added " + ind.getName() + " " + ind.getURI());
-                		}
-                    }else{
-                    	log.debug("could not translate, removing from index " + ind.getURI());
-                    	writer.deleteDocuments((Term)obj2doc.getIndexId(ind));
+        	    log.debug("indexing " + ind.getURI());
+                Iterator<Obj2DocIface> it = getObj2DocList().iterator();
+                while (it.hasNext()) {
+                    Obj2DocIface obj2doc = (Obj2DocIface) it.next();
+                    if (obj2doc.canTranslate(ind)) {
+                    	Document d = (Document) obj2doc.translate(ind);
+                    	if( d != null){                		                		                		
+                    		if( !newDoc ){                    	                    		
+                    			writer.updateDocument((Term)obj2doc.getIndexId(ind), d);
+                    			log.debug("updated " + ind.getName() + " " + ind.getURI());
+                    		}else{                    	
+                        		writer.addDocument(d);
+                        		log.debug("added " + ind.getName() + " " + ind.getURI());
+                    		}
+                        }else{
+                        	log.debug("could not translate, removing from index " + ind.getURI());
+                        	writer.deleteDocuments((Term)obj2doc.getIndexId(ind));
+                        }
                     }
-                }
-            }
+                }
+        	}
         } catch (IOException ex) {
             throw new IndexingException(ex.getMessage());
         }
@@ -238,7 +239,7 @@ public class LuceneIndexer implements IndexerIface {
         if( writer == null )
             throw new IndexingException("LuceneIndexer: cannot delete from " +
             		"index, IndexWriter is null.");
-        try {
+        try {            
             Iterator<Obj2DocIface> it = getObj2DocList().iterator();
             while (it.hasNext()) {
                 Obj2DocIface obj2doc = (Obj2DocIface) it.next();
@@ -280,10 +281,14 @@ public class LuceneIndexer implements IndexerIface {
         File offLineDir = new File(currentOffLineDir);
         File liveDir = new File(liveIndexDir);
         boolean success =  offLineDir.renameTo( liveDir );
-        if( ! success )
+        if( ! success ){
             log.error("could not move off line index at " 
                     + offLineDir.getAbsolutePath() + " to live index directory " 
                     + liveDir.getAbsolutePath());
+        }else{            
+            deleteDir(new File(currentOffLineDir));
+            currentOffLineDir = null;
+        }
     }  
     
     private synchronized String getOffLineBuildDir(){
@@ -334,7 +339,7 @@ public class LuceneIndexer implements IndexerIface {
                     "be null but it isn't");
         if( this.currentOffLineDir != null)
             log.error("it is expected that the current" +
-                    "OffLineDir would be null but it is " + currentOffLineDir);
+                    "OffLineDir would be null but it is " + currentOffLineDir);      
         if( indexing )
             log.error("indexing should not be set to true just yet");        
     }