added server safety
server fixes
server fixes
merge