Tomcat is in

Also standardized on server and username for attributes