Fixed list and bugs, National list still crashes device.