Misc. Bug Fixes

Checking a bunch of bugs off the list, and starting to get Rainbow
adaptive.