fixing bug in Data, preparing friends related data functions