updated to latest valo, removed some haxies that are no more needed, updated jetty