Merge {Proxy,Server}{Pull,Push}Message, redo startup messages