Improved image support (hopefully). Corrected typo.