also some improvements but I get the impression that the whole things needs rewriting from scratch to match other parts of the work