wrongness metric improved, removed some dead code