fixing some comms stuff