Nancymarinelli/nm700 refinements

Slava's  comments on 700pre7  implemented plus some other code cleaning