Highlight of current score, few fixes