Made C++ code more verbose (verbose is now a integer specifying the level of verbosity) and fixed a mix-up showing s as p and vice versa.