added better watches inside the directive, and change octave numbers