buncha form agony re: quantity
fixed merge conflicts