fixing the 'pull everything from ic2' issue.

because some of the cc code was part of one of the commits, i pulled the other one also.

No dependency on bc 3.6 yet.