added image stuff
fixed conflicts