Fixed comments.  Cleaned up code a bit.