Adjustments to options, refinement, some Mavericks updates