add better fork tracking