fixed a few places I was passing the incorrect tokens around