Right to both points -- that's how I read it too. You could call it "crippleware", though autopilot hardware (albeit on a 2018 car, though on the other hand in 35k of 2018 dollars) ain't exactly cheap. It's probably more economical for Tesla to build the cars with the same h/w and then upcharge for the s/w. And it's nice to have the opportunity to do a software update for it if you later want it, even though I know some don't like the crippleware "feel". And yes, I also heard them saying the safety stuff will be standard. Again, makes sense. Nobody wants the bad PR of installing safety hardware, but some poor family got killed by their Unsafe Tesla Car (TM) because of a software feature that was disabled by Evilon Musk.