urls and api refined to make sense