minor cleanup and NB validation still not working