Rationalized extradata handling, but broke sipr
Fixed SIPR, and handling of 0-length extradata