Fix web.xml, some cleanup