Cleanup.  Also started adding a better yank ring but only half working