improvements in dump
Dump functions too