add solr, lots of other updates/fixes