rename receiver.  minor cleanups.