changed server and servermodule to fix them