Merge/cmake server more info

First a small clean-up patch, then some patches that make the server report more information back to the client.