final server changes
minor changes
Merge pull request #4 from 1ton/master

Fixes in server