added the tracking system but still needs more work also fixed the bug with image updates