Minor tweaks
Redo image saving and display