A bit of a clean up, commenting, and start of work on *configure*.