friends again + small fix