Bug correcting, and going full c++
diverse updates