HTTP module updates

It seems the 'httpmodule' branch can be merged now...