final control tweaks for now