things are working again.

Next: remove types from ev and lambda