More jobstats work, rename from trace