added correct callback fn params,
also added a couple more expects