changed stops api, fixed location update