Adding a few comments and other misc. cleanup work.