Fixed some content-type issues
Fixed up webserver.py a little bit more