more fixes to focusing