code cleanup, added some temp examples