FINAL COMMIT after correction with Tune. I have tested that the NA detection for clumping works. Mail with rebuttal is now sent to JH.