- server fixes
- crash fixes