Fixes to server config

Also:
* other fixes to package run scripts
* server script structure (same comment style etc..)