Bug cleanup and other goodness.