Changed List to Collection. Makes it possible to use map.keySet() for instance
Added weights to query, and some simple query expansion.