w-mode and w-mode-class methods refact and debug, diatonic-passing start work