A number of changes related to network and location mapping, --starttime and --endtime