Add discussion introduction
Misc clean up
Clean up
Clean up