reworked validator, elasticsearch junk...