Cleaning up main.

Mostly changes to comments to clean up after name change.