Last commit before switching to using receive function instead of straightline code.

Minor tweaks.