More bug fixes

Specifically, removed a bug with trying to send more than one
attachment.  It should work, but for is not for some reason.  Will
troubleshoot later.