Correct Neutrino Mass Fix & Clean-up