WebServer + bugfixing