Out-commented plot, and other minor changes
Data generation and analysis setup