Added handle fixes and ability to save the image