Stop coding in c++, add vestigial code for simulated failures. Fix other sillyness