fix broken message.  Clean up uneccesary code.  Add save-excrusion