first formatted parsing/print of functions
added back more dump stuff