Ran Coder Review and Modified involved files.
New NDDB, finished Coder Review.