Multiple image upload and some minor improvements