Now they are 30'2M and show around 16'7M in 2018. More in line with what i expected (close to 16'5M) and around 29'5-30'0M lifetime by the end of the year.
After seeing that PS4 has 2'6M on shelves, ZhugeEX tweet and Switch shipping 32'2M, i'm not surprised if Switch has around 2'5M on shelves too, so around 29'7M sold in reality. With this adjustment, we have more accurate numbers now.
Edit: Probably more adjustments coming, so we'll see where it ends.