You are correct re the Powerwall and Powerpack confusion. I had gotten the information off of the Wikipedia article and accidentally combined information from the two tables.

That definitely changes the cost/weight/power equations.