The estimated time will adjust as you use it. You should see it change over the next couple of days. If you re-calibrated, then the estimated time is starting fresh. Give it a few days.
Nope. Also keep in mind that those are just estimates generated by the software. Does your phone last as long as you need to use it? If so, there is no need to stress about it.