added tracking and changed some texts a bit