major changes

Forgotten SaveImage, look through previous code