Debugging infi (to be later printed only with -v); plus a dump program
fixed merge conflict
All tests pass again
+ test w/ empty model