Numerous modifications and new plots

A lot of small changes and additional plots for performance metrics