passing some more tests (still failing 84)
ready to publish as pull request