misc fixes and 07_10.cpp