fixed dwf's comments.