Cleanups and added samples