better event management, API changes
show next/previous
cleanup