Various algorithm fixes mentioned in journal