NAG

Failing examples altered; code reorganized.