I went there this month
We drove through Peace Bridge. You just need your visa to enter Canada. When you come back, show the office your valid I-94 and tell her/him that you are there for travel. You don't need to get visa to come back if you return in 30 days. Very simple.
Good luck.