a few focus regressions and tweaks