global settings tucked into object, plus other cosmetic code improvements