Beta 0.9.9

Mostly under-the-hood improvements