Worked on odds and ends; some refactoring of Sender