add options; move event providers back into eventdb; fix some tests