add jetty adapter; some minor cleanup