Expands output

Adds detailed output, and graphs