Cleanup, added drawings for presentation