corrected occurrences of blackborad N to N_0
fixed minor typos and bugs
Merge remote-tracking branch 'upstream/master'