fixing communications bugs