Further Rainbow Fixes

Rainbow is in much better shape now, and a handful of other bugs were
wiped out.