* deserialize fix to return the right outermost function

* fix tests

* more switches to print out/visualize shapes