Image tracking tweaks
Resolved conflict, and fixed compilation errors