got all tests passing.  fixes #3