Added number toggle and fixed leader.