Fix - fixed arg_expand function and added ability to get total time