Fix comments
Upgrade to netty 4.0 beta 3