More updates on the plotting tool