part two of the grand overall wps/skinning engine cleanup work: