Major code restructuring and output format changes. -N required

for node-centric output. -n and -p always require a filter argument.