Cleanups and more examples