Minor cleanups and added examples