Various minor changes, added some problems for C++ versions