More cleanup, names for Cp, gamma, R changed