upgraded parser + jetty (only a little bit of puking)