fixes and webserver