Fixed some plots but still need to fix formatting