Edgarfixes

More general version of tomcat, although intended for GUMS use