Touch ups and clean up of code and debug statements. Added new enum for source and receiver IDs to centralize values.