Small fixes, added elasticsearch