Removed some code that didn't do anything and cleaned things up
Removed unused code and an extra initialization of the sender/receiver
Stuff won't explode if you try to get a message when there aren't any
Merging (bringing in changes I haven't put up on github)