--- a/js/startscreen.js	Wed Mar 06 18:09:40 2013 +0100
+++ b/js/startscreen.js	Fri Mar 08 19:05:17 2013 +0100
@@ -86,7 +86,6 @@
             */
             TopicsBean.topicsForKeywords(selectedWords.join(","),{
                 callback: function(topicweights) {
-                    console.log(topicweights);
                     var topiclist = data.topics.filter(function(topic) {
                         return topicweights[topic.index] > .01 && topic.index !== topicPoubelle;
                     });
@@ -147,7 +146,7 @@
         
         showTopicViz();
     }
-// /*        
+/*        
         var topwords = [], globwords = {};
         
         data.topics.forEach(function(topic) {
@@ -169,37 +168,51 @@
         $(".keyword-search").autocomplete({
             source: topwords.map(function(w) { return w.word })
         }).on("keyup change paste", wordFilter);
-// */
- /*
-    var globwords = {},
-        allwords = [];
+ */
+// /*
+    var globwords = {};
     
     data.topics.forEach(function(topic) {
-        topic.words.forEach(function(word) {
-            globwords[word.word] = 1
+        topic.words.forEach(function(topicword) {
+        	topicword.word.split(" ").filter(function(w) {
+        		return w.length > 2;
+        	}).forEach(function(w) {
+        		globwords[w] = 2 * topicword.weight + (globwords[w] || 0)
+        	});
         });
     });
     
-    var ntw = data.topwords.length,
-        topwords = data.topwords.map(function(v, k) {
-        globwords[v] = 1;
-        return {
-            word: v,
-            weight: ntw - k
-        }
+    var ntw = data.topwords.length;
+    
+    data.topwords.forEach(function(v, k) {
+    	var weight = (ntw - k)/ntw;
+    	v.split(" ").filter(function(w) {
+    		return w.length > 2;
+    	}).forEach(function(w) {
+    		globwords[w] = weight + (globwords[w] || 0)
+    	});
     });
     
-    for (var w in globwords) {
-        if (globwords.hasOwnProperty(w)) {
-            allwords.push(w);
-        }
-    }
+    delete globwords.des;
+    
+    var allwords = _(globwords).keys(),
+    	topwords = _(globwords).map(function(v, k) {
+    		return {
+    			word: k,
+    			weight: v
+    		}
+    	});
+    
+    topwords.sort(function(a,b) {
+    	return b.weight - a.weight
+    });
+    
     allwords.sort();
     
     $(".keyword-search").autocomplete({
         source: allwords
     }).on("keyup change paste", wordFilter);
- */
+// */
 
     var wordsToShow = topwords.slice(0,80),
         max = wordsToShow[0].weight,
@@ -372,7 +385,6 @@
     function checkIfLoaded() {
         loadedSteps++;
         if (loadedSteps >= stepsToFullyLoaded) {
-            console.log("Showing data");
             setTimeout(showData,0);
         }
     }
@@ -445,8 +457,7 @@
                     start: start,
                     end: end,
                     duration: end - start,
-                    topics: topics,
-                    tweet_count: (end - start) * (35 + 3 * Math.random()) //TODO: dissociate tweet counts from segments
+                    topics: topics
                 }
             }).sort(function(a,b) {
                 return a.start - b.start;
@@ -479,6 +490,6 @@
         
     });
     
-    //loadFromTopicsBean("getTopWords","topwords",[400]);
+    loadFromTopicsBean("getTopWords","topwords",[200]);
     
 });