More changes to webserver (not done yet)