bug fixes

currently ignores link messages