wsp
a few small fixes