Cosmetics, mostly, and a few small bugs fixes