attempt for server optimization
server opt2, removed some args
Merge pull request #2 from fazzeh/development

24-1 nightly stable pull