Assorted tweaks, better Tomcat control.