Made (mostly) ready for primetime beta.