* Lots of C++ states added
* A bit better debugging