reformat to comply with PEP8
support CSP 1.1 syntax, numerous minor changes in documentation