change fd to events and remove test prints
clean ups