Adds add_receiver method to environment
Cleanup a few receiver things