moving stuff to its own module
added several good changes
prevent some bugs from empty solr