more bugs in time estimation calculations