Fixed minor bugs, changed get time elapsed