Data fix

Updated scripts that generate the location and event data.