Some tidying up, get_app_friends updated