worked out most bugs in poly2.scm