cspad fixed, wrapFunction seems to mainly work now.