More bug fixes with focused state and attention indicators.