Added plots and fixed tables