fully working resize and upload images
merge fixes