RR 0.9.3.1

Folded in my changes and corrected some stuff I broke by mistake in 0.9.2.1.

I've left some notes that'll show up in the comparison.