CSP tweaks
Bugfixes and formatting tweaks