cleanup
tomcat parser
fixes