Replace N with x in printouts
Merge with master