- Fix plot for plot4
- Cleanup some comments