fix: quick code review on CSP implementation and fixed typos around
- quick code review on CSP implementation and fixed typos around in all code
- missed implementations marked with [TODO]
- obsoleted implementation to remove with interface change V3->V4 marked as [OBSOLETE]