Added a receiver and some more cleanup