finished comms bug fixing