Properly add tags from IPTC (#1112) and clean up some minor things