cpp stuff added; cleanup