Now ready, minor algorithm fixes.