various improvements and embedding jetty for test