Added hotspot locations, other fixes