Bugfixes: improved SplitProof. Some TODOs remain.