cppsp: WIP
misc changes