Add nice plot
Fix up some comments