Comments.
Cleanup.
Response to Amalia's critique.