Focus states 2

fixes #2

fixes #246