Fix spot modes, add beacon.