Update TEPHIN, remove nadams, add edgar