Minor main VM tweaks, get_images changes, gallery VM tweaks