Add  and .  Fix some issues with highlights.