Added Javadoc and DeadMessage handling