fixes and focus directive