changes to output re: location + endpoint

From #865