More work on tcp messages