calculational fixes