fixes and added wrapper cpp class