new wm, small fixes