Tomcat updated. Some minor changes.