Some minor cleanups and extra comments.