added os detection, change modelMatch array key names for clarity