comment on CXX and improve others