ongoing tweaks for os x fits