form fixes and trying to add vendor ability