INTERNAL: initial step in supporting multiple devices on map had been implemented.
INTERNAL: initial step in supporting multiple devices on map had been implemented. minor updates.