Proper output to fit paper and tinkering

Outputs now match graphs of paper. Some tinkering was done to fit the
current model of testing and revise network. No major structural
changes.