remove some debugging code
fix merge conflict
add extra exif keys