Removed the 'TODO Fix this description's that I forgot to remove before
Modified Javadocs in messaging package