Stikki's fixes, plus new default_image parameter.