more examples & cleanup