Cleaned up some comments and other things.