+ ack, c++, some minor changes