Disabled tracking + solved some bugs