Fixed a few bugs, removed passReqToCallback