Review and cleanup of N&N content. (#57)

Cleanup and fix validation errors
8 files changed