rework percentage & time computation functions