Minor updates
for fun
Merge branch 'NN'
Merge branch 'NN'