fixes to focus