fixed stupid boiler plate and working on buyer cancel
merge