Initial tweaks for my environment