clean up examples, tweaks to api