add tomcat ctrl, small updates