adding support for image upload + fix