More algorithm improvements