clean up, add examples to, ref #3