Bug fixes.

Please see my email about how we'd like work prioritized.