More work on McInput. Now appears to correctly handle 0,1, or 2 data sub-ranges