Fixed update values, times, and calls. Had to change main.h as well to reflect some changes.