updated comments, etc.