some improvements and did some fleshing out of the focused indicator
scripted update of code from master at 6b228ea some improvements and did some fleshing out of the focused indicator