cleaned up some comments and exception messages.