nits, comments, fix example, minor changes