moved BW2 doubles to OM, small fixes