Added a comment for a TODO on ChannelSelector and added a 30 second time out inside the waiting portion inside Channel Thread.