Yay! More rainbow algorithm improvements