Fix run-time bug + console output + comments
Merge pull request #3081 from ussuri/csp-fixer

Fix run-time bug + console output + comments