Clean up and document.  Also merge autoHeaders into web itself