a few more fixes on incoming, not quite working yet