fix bug and finishing vendor