More modification of estimates, created some fixes