Tomcat 8, Messaging and some code polishing.