cosmetic changes
obv fix
serverclient small fix