- all elements of SPSNext are moved into SPS
- syntax elements of SPS are sorted according to draft (as far as possible)
- comments were added where software and draft diverge