cleanup
fixed #325
initial support for EEP37: funs with names