Added Elasticsearch and more bugfixes