CustomFocusListener added

and other stuff