cleaned up some stuff & added vendor to view