added server + bugfix