General Cleanup

General cleanup to correct plots.