Added functionality to server comments

Also (hopefully) fixed the bug of NAT-punch not working
Merge pull request #231 from bobsayshilol/master

More NAT stuff