various minor web server cleanups and move arounds