Decouple the channel ID and the server's pubkey
Use if/for block braces for my sanity and yours.
Fix / clean the serverd code to work with latest bitcore