Working a bit on image matching.
Fixing merge conflicts and a bit of cleanup.