Fixes taxonomy output, adds n/a count output, and other cleanup, small rearrangement