More updates and integrated Jetty server