tighten up; update examples