rainbow commit
more embarassing fixes along with some work

(this history is getting deleted, I promise)