sender modifications
minor tweaks
cleaning up
Revert "cleaning up"

This reverts commit 3ac0d1a72c0f8f1fa4888b286821ef8873ac4877.