Added catalina.properties for tomcat

And bug fixes