Updates and optimizations. Now we observe only two errors
in the less capable collisions.