change to use send, misc improvements