Updated Sami config.
Fixed comment block issues.