Output cleanup and more examples