Fix for the timespan logic

My logic last time was faulty which was causing the time to go over,
this is a better way of estimating the batches and gets us very close to
the total time (at least in my tests so far) :)