More updates on the plotting tool, still buggy