Fixed some of David's comments.