mvc: save sub_sps data in the right place
mvc: save sub_sps data in the right sps
wip
mvc: remove 15 and 20 from parser
mvc: make sure to mark the stream correctly