Fixed issue #35: valuation and normalization are now correct, the latter is slightly longer. All doctests pass!!