Better implementation of s16 -> s16p. Also fixing export table.