Fix for system/static modes
Fix sample config file.
Doc update.