some more fixes + address in server start