NN fixes and todos