Cleanup.  Painter's Flower Pot merged.  Small things. v1.9.9 candidate.