small fixes in wrapping
Merge branch 'parity'