- code cleanup
- fixed server crash