few more fixes, test suite now completes