more windows checking and cpp stuff