Tweaks based on testing tuesday.  Untested.
Added target print, and cleaned up other prints