I have done the type input for the market feature, but still working on the same for immigration, but right now working on the large credit and resource numbers issue. I will post a patch as it I am done with it.
