add some missed C++ keywords. improve g++ notes handling.