Finished tracking mode. Bug fixes. Started adding new features