Update TODO. Should allow null values of image width and height since image files disappear sometimes and fields have to be emptied.
