Improve tracking and add debug panel with map