Updated data to include in-game IDs when possible. Some work on marker data.