Various adjustments and refinements