fix example, misc changes