redo/comment/add args to sendmail; minor cleanups