Updated application to fix issues with startup
Fix TomcatServer JMX startup and some code tidying