Added remaining tracking method calls
Added some Settings Activity stuff