Modified file output name, removed time limit on topology