fixing bug in nntrain
removing some noisy output
fixing merge conflict