sender fixes and cleanup