add Events and Iterable, fix minor issues