As the expansion draft rules are, in part, based on 2016 - 17 salaries, should the player salaries on the tool be reverted back to 2016 - 17 values? I know it probably won't make a huge difference, but still.

Yes you are right, we have put it back to last years cap hits