NMS mostly corrected and updated (some minor spots still need resolved)