Differentiate the batchCallback from the callback

Also stop relying on raf to queue stuff, it seems to work better this way