fixes
cleanup and empty boxes on send