misc design refinements