I was also averaging 16 something mpg on my first couple tanks. Now I am averaging 24. Highway mpg is as advertised, but local you have to drive very carefully to achieve 21 mpg. Sport mode driving gives me 14 mpg, but man isn't it such a good feeling to see cars disappearing in the rear view mirror.
How good was your deal?