commit some cpp fixes