Changed where images are saved and updated other.