some c++ changes
dbg st