final touches and refinements