added some receiver shape and cleaned things up a bit