added image support plus a few other things