Readded image headers.
Made the wishlist operate on addition order.